Skip to content

Commit 466e2c1

Browse files
wynbennettwynbennett
committed
Merge branch 'main' into wyn.bennett/DELA-237-selective
# Conflicts: # comp/core/agenttelemetry/def/go.mod # comp/core/agenttelemetry/def/go.sum # comp/core/agenttelemetry/fx/go.mod # comp/core/agenttelemetry/fx/go.sum # comp/core/agenttelemetry/impl/go.mod # comp/core/agenttelemetry/impl/go.sum # comp/core/config/go.mod # comp/core/config/go.sum # comp/core/configsync/go.mod # comp/core/configsync/go.sum # comp/core/ipc/httphelpers/go.mod # comp/core/ipc/httphelpers/go.sum # comp/core/ipc/impl/go.mod # comp/core/ipc/impl/go.sum # comp/core/ipc/mock/go.mod # comp/core/ipc/mock/go.sum # comp/core/log/fx/go.mod # comp/core/log/fx/go.sum # comp/core/log/impl-trace/go.mod # comp/core/log/impl-trace/go.sum # comp/core/log/impl/go.mod # comp/core/log/impl/go.sum # comp/core/log/mock/go.mod # comp/core/log/mock/go.sum # comp/core/secrets/fx/go.mod # comp/core/secrets/fx/go.sum # comp/core/secrets/impl/go.mod # comp/core/secrets/impl/go.sum # comp/core/status/statusimpl/go.mod # comp/core/status/statusimpl/go.sum # comp/core/tagger/def/go.mod # comp/core/tagger/def/go.sum # comp/core/tagger/fx-remote/go.mod # comp/core/tagger/fx-remote/go.sum # comp/core/tagger/impl-remote/go.mod # comp/core/tagger/impl-remote/go.sum # comp/core/tagger/subscriber/go.mod # comp/core/tagger/subscriber/go.sum # comp/forwarder/defaultforwarder/go.mod # comp/forwarder/defaultforwarder/go.sum # comp/forwarder/orchestrator/orchestratorinterface/go.mod # comp/forwarder/orchestrator/orchestratorinterface/go.sum # comp/logs/agent/config/go.mod # comp/logs/agent/config/go.sum # comp/otelcol/converter/impl/go.mod # comp/otelcol/converter/impl/go.sum # comp/otelcol/ddflareextension/impl/go.mod # comp/otelcol/ddflareextension/impl/go.sum # comp/otelcol/logsagentpipeline/go.mod # comp/otelcol/logsagentpipeline/go.sum # comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod # comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum # comp/otelcol/otlp/components/exporter/datadogexporter/go.mod # comp/otelcol/otlp/components/exporter/datadogexporter/go.sum # comp/otelcol/otlp/components/exporter/logsagentexporter/go.mod # comp/otelcol/otlp/components/exporter/logsagentexporter/go.sum # comp/otelcol/otlp/components/exporter/serializerexporter/go.mod # comp/otelcol/otlp/components/exporter/serializerexporter/go.sum # comp/otelcol/otlp/components/processor/infraattributesprocessor/go.mod # comp/otelcol/otlp/components/processor/infraattributesprocessor/go.sum # comp/otelcol/otlp/testutil/go.mod # comp/otelcol/otlp/testutil/go.sum # comp/otelcol/status/impl/go.mod # comp/otelcol/status/impl/go.sum # comp/serializer/logscompression/go.mod # comp/serializer/logscompression/go.sum # comp/serializer/metricscompression/go.mod # comp/serializer/metricscompression/go.sum # pkg/api/go.mod # pkg/api/go.sum # pkg/config/create/go.mod # pkg/config/create/go.sum # pkg/config/env/go.mod # pkg/config/env/go.sum # pkg/config/helper/go.mod # pkg/config/helper/go.sum # pkg/config/mock/go.mod # pkg/config/mock/go.sum # pkg/config/nodetreemodel/go.mod # pkg/config/nodetreemodel/go.sum # pkg/config/remote/go.mod # pkg/config/remote/go.sum # pkg/config/setup/go.mod # pkg/config/setup/go.sum # pkg/config/structure/go.mod # pkg/config/structure/go.sum # pkg/config/teeconfig/go.mod # pkg/config/teeconfig/go.sum # pkg/config/utils/go.mod # pkg/config/utils/go.sum # pkg/config/viperconfig/go.mod # pkg/config/viperconfig/go.sum # pkg/fleet/installer/go.mod # pkg/fleet/installer/go.sum # pkg/gohai/go.mod # pkg/gohai/go.sum # pkg/logs/client/go.mod # pkg/logs/client/go.sum # pkg/logs/diagnostic/go.mod # pkg/logs/diagnostic/go.sum # pkg/logs/message/go.mod # pkg/logs/message/go.sum # pkg/logs/pipeline/go.mod # pkg/logs/pipeline/go.sum # pkg/logs/processor/go.mod # pkg/logs/processor/go.sum # pkg/logs/sender/go.mod # pkg/logs/sender/go.sum # pkg/logs/sources/go.mod # pkg/logs/sources/go.sum # pkg/logs/util/testutils/go.mod # pkg/logs/util/testutils/go.sum # pkg/metrics/go.mod # pkg/metrics/go.sum # pkg/network/driver/go.mod # pkg/network/driver/go.sum # pkg/opentelemetry-mapping-go/otlp/logs/go.mod # pkg/opentelemetry-mapping-go/otlp/logs/go.sum # pkg/orchestrator/model/go.mod # pkg/orchestrator/model/go.sum # pkg/process/util/api/go.mod # pkg/process/util/api/go.sum # pkg/serializer/go.mod # pkg/serializer/go.sum # pkg/trace/go.mod # pkg/trace/go.sum # pkg/trace/otel/go.mod # pkg/trace/otel/go.sum # pkg/trace/stats/go.mod # pkg/trace/stats/go.sum # pkg/util/cgroups/go.mod # pkg/util/cgroups/go.sum # pkg/util/compression/go.mod # pkg/util/compression/go.sum # pkg/util/defaultpaths/go.mod # pkg/util/defaultpaths/go.sum # pkg/util/filesystem/go.mod # pkg/util/filesystem/go.sum # pkg/util/flavor/go.mod # pkg/util/flavor/go.sum # pkg/util/grpc/go.mod # pkg/util/grpc/go.sum # pkg/util/hostinfo/go.mod # pkg/util/hostinfo/go.sum # pkg/util/hostname/validate/go.mod # pkg/util/hostname/validate/go.sum # pkg/util/http/go.mod # pkg/util/http/go.sum # pkg/util/jsonquery/go.mod # pkg/util/jsonquery/go.sum # pkg/util/kubernetes/apiserver/common/namespace/go.mod # pkg/util/kubernetes/apiserver/common/namespace/go.sum # pkg/util/log/go.mod # pkg/util/log/setup/go.mod # pkg/util/log/setup/go.sum # pkg/util/system/go.mod # pkg/util/system/go.sum # pkg/util/uuid/go.mod # pkg/util/uuid/go.sum # pkg/util/winutil/go.mod # pkg/util/winutil/go.sum # test/otel/go.mod # test/otel/go.sum
2 parents fe0cee9 + c8b028a commit 466e2c1

File tree

417 files changed

+12643
-169376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

417 files changed

+12643
-169376
lines changed

‎.adms/bazel/adms.mirror.cfg‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ allow mirrors.edge.kernel.org
3838

3939
# Sqreen sources
4040
# (https://github.com/DataDog/logs-backend/blob/93eccaef54c4d0f99151c2bf49ff2bcb028c0bd7/rules/jvm/setup.bzl#L64-L73)
41-
allow sqreen-ci-java.s3.amazonaws.com
41+
# incident-48655
42+
# allow sqreen-ci-java.s3.amazonaws.com
4243

4344
# dd-agent and dd-trace jars
4445
# (https://github.com/DataDog/logs-backend/blob/8ea7c29de6185481f61ba0b3affa97acad69d18b/rules/jvm/setup.bzl#L84-L98)

‎.dda/extend/commands/gh/cherry_pick_pr/__init__.py‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,28 @@
2121
features=["github"],
2222
)
2323
@click.option("--pr-number", type=int)
24-
@click.option("--target-branch", type=str)
24+
@click.option("--target-branch", type=str, required=True)
2525
@pass_app
2626
def cmd(
2727
app: Application,
28+
target_branch: str,
2829
pr_number: int | None = None,
29-
target_branch: str | None = None,
3030
) -> None:
3131
"""
3232
Cherry-pick a merged PR changes to another branch.
3333
"""
34-
# Use pr_number and target_branch if provided, otherwise use the event
35-
if pr_number and target_branch:
34+
# Get the PR either from --pr-number or from the event
35+
if pr_number:
3636
original_pr = get_pr_by_number(pr_number)
37-
base = target_branch
3837
else:
3938
event = get_event()
4039
original_pr = event.get("pull_request")
4140
if not original_pr:
42-
app.display_warning("Expecting a pull request event or --pr-number and --target-branch arguments.")
43-
return
44-
base = find_backport_target(original_pr.get("labels", []))
45-
if not base:
46-
app.display_warning("No backport/<target> label found. Skipping backport.")
41+
app.display_warning("Expecting a pull request event or --pr-number argument.")
4742
return
4843

44+
base = target_branch
45+
4946
# Merge commit SHA (the commit created on base branch)
5047
merge_commit_sha = original_pr.get("merge_commit_sha")
5148
if not original_pr.get("merged", False) or not merge_commit_sha:
@@ -133,19 +130,6 @@ def get_event() -> dict:
133130
return json.load(f)
134131

135132

136-
def find_backport_target(labels: list[dict]) -> str | None:
137-
"""
138-
Look for a label of the form 'backport/<target>' and return <target>'.
139-
"""
140-
for lbl in labels:
141-
name = lbl.get("name")
142-
if not name:
143-
continue
144-
if name.startswith("backport/"):
145-
return name.split("/", 1)[1]
146-
return None
147-
148-
149133
def get_non_backport_labels(labels: list[dict]) -> list[str]:
150134
"""
151135
Get all labels that are not backport labels.

‎.ddqa/config.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,3 +252,10 @@ jira_issue_type = "Task"
252252
jira_statuses = ["To do", "In Development", "Done"]
253253
github_team = "data-streams-monitoring"
254254
github_labels = ["team/data-streams-monitoring"]
255+
256+
[teams."Profiling Full Host"]
257+
jira_project = "PROF"
258+
jira_issue_type = "Task"
259+
jira_statuses = ["To Do", "In Progress", "Done"]
260+
github_team = "profiling-full-host"
261+
github_labels = ["team/profiling-full-host"]

‎.github/CODEOWNERS‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,10 @@
9999
/.gitlab/.pre/maintenance_jobs/* @DataDog/agent-devx
100100
/.gitlab/.post/notify/* @DataDog/agent-devx
101101
/.gitlab/build/pkg_metrics/* @DataDog/agent-devx
102-
/.gitlab/.post/post_rc_build/* @DataDog/agent-devx
102+
/.gitlab/.post/post_rc_build/* @DataDog/agent-delivery
103103
/.gitlab/.pre/setup/* @DataDog/agent-devx
104104
/.gitlab/deploy/trigger_distribution.yml @DataDog/agent-delivery
105105
/.gitlab/distribute/trigger_release/* @DataDog/agent-devx @DataDog/agent-delivery
106-
107106
/.gitlab/build/binary_build/cws_instrumentation.yml @DataDog/agent-devx @DataDog/agent-security
108107
/.gitlab/build/binary_build/linux.yml @DataDog/agent-devx @DataDog/agent-build
109108
/.gitlab/test/functional_test/static_quality_gate.yml @DataDog/agent-build
@@ -169,7 +168,7 @@
169168

170169
/.gitlab/deploy/dev_container_deploy/ @DataDog/container-integrations @DataDog/agent-delivery
171170
/.gitlab/deploy/dev_container_deploy/fakeintake.yml @DataDog/agent-devx
172-
/.gitlab/deploy/dev_container_deploy/e2e.yml @DataDog/agent-devx
171+
/.gitlab/deploy/dev_container_deploy/e2e.yml @DataDog/agent-devx
173172
/.gitlab/deploy/dev_container_deploy/docker_windows.yml @DataDog/agent-delivery @DataDog/windows-products
174173

175174
/.gitlab/deploy/container_scan/container_scan.yml @DataDog/container-integrations @DataDog/agent-delivery
@@ -625,6 +624,7 @@
625624
/pkg/network/ @DataDog/cloud-network-monitoring
626625
/pkg/network/*usm* @DataDog/universal-service-monitoring
627626
/pkg/network/*_windows*.go @DataDog/windows-products
627+
/pkg/network/*usm*windows*.go @DataDog/windows-products @DataDog/universal-service-monitoring
628628
/pkg/network/config/config_test.go @DataDog/cloud-network-monitoring @DataDog/universal-service-monitoring @DataDog/windows-products
629629
/pkg/network/config/usm*.go @DataDog/universal-service-monitoring
630630
/pkg/network/driver_*.go @DataDog/windows-products
@@ -639,15 +639,16 @@
639639
/pkg/network/ebpf/c/protocols/tls @DataDog/cloud-network-monitoring @DataDog/universal-service-monitoring
640640
/pkg/network/encoding/marshal/*usm* @DataDog/universal-service-monitoring
641641
/pkg/network/encoding/marshal/*_windows*.go @DataDog/windows-products
642+
/pkg/network/encoding/marshal/*usm*windows*.go @DataDog/windows-products @DataDog/universal-service-monitoring
642643
/pkg/network/go/ @DataDog/universal-service-monitoring
643644
/pkg/network/protocols/ @DataDog/universal-service-monitoring
644-
/pkg/network/protocols/http/driver_*.go @DataDog/windows-products
645-
/pkg/network/protocols/http/etw*.go @DataDog/windows-products
646-
/pkg/network/protocols/http/*_windows*.go @DataDog/windows-products
645+
/pkg/network/protocols/http/driver_*.go @DataDog/windows-products @DataDog/universal-service-monitoring
646+
/pkg/network/protocols/http/etw*.go @DataDog/windows-products @DataDog/universal-service-monitoring
647+
/pkg/network/protocols/http/*_windows*.go @DataDog/windows-products @DataDog/universal-service-monitoring
647648
/pkg/network/tracer/testutil/proxy/ @DataDog/universal-service-monitoring
648649
/pkg/network/tracer/*_windows*.go @DataDog/windows-products
649650
/pkg/network/usm/ @DataDog/universal-service-monitoring
650-
/pkg/network/usm/tests/*_windows*.go @DataDog/windows-products
651+
/pkg/network/usm/tests/*_windows*.go @DataDog/windows-products @DataDog/universal-service-monitoring
651652
/pkg/networkconfigmanagement/ @DataDog/ndm-core @DataDog/ndm-integrations
652653
/pkg/ebpf/ @DataDog/ebpf-platform
653654
/pkg/ebpf/map_cleaner*.go @DataDog/universal-service-monitoring

‎.github/chainguard/codeql.sts.yaml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
issuer: https://gitlab.ddbuild.io
2-
subject_pattern: "project_path:DataDog/datadog-agent:ref_type:branch:ref:.*"
1+
issuer: https://vault.us1.ddbuild.io/v1/identity/oidc
2+
subject_pattern: "bf4480b0-ee11-5050-758d-189b036f7ee8"
33
claim_pattern:
4-
project_path: "DataDog/datadog-agent"
5-
ref_type: "branch"
6-
ref: ".+"
7-
ref_path: "refs/heads/.+"
8-
ref_protected: "true"
4+
name: "gitlab-runner-datadog-agent-datadog-agent"
95
permissions:
106
security_events: write

‎.github/workflows/backport-pr.yml‎

Lines changed: 46 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,51 @@ on:
66
- labeled
77

88
jobs:
9+
get-backport-targets:
10+
name: Get backport targets
11+
runs-on: ubuntu-latest
12+
if: github.event.pull_request.merged
13+
outputs:
14+
targets: ${{ steps.get-targets.outputs.targets }}
15+
steps:
16+
- name: Get backport targets
17+
id: get-targets
18+
run: |
19+
# For 'labeled' event, use just the added label
20+
# For 'closed' event, use all backport labels
21+
if [[ "${{ github.event.action }}" == "labeled" ]]; then
22+
if [[ "${{ github.event.label.name }}" == backport/* ]]; then
23+
echo "targets=[\"${{ github.event.label.name }}\"]" >> $GITHUB_OUTPUT
24+
else
25+
echo "targets=[]" >> $GITHUB_OUTPUT
26+
fi
27+
else
28+
# Extract all backport/* labels as JSON array
29+
targets=$(echo '${{ toJson(github.event.pull_request.labels.*.name) }}' | jq -c '[.[] | select(startswith("backport/"))]')
30+
echo "targets=$targets" >> $GITHUB_OUTPUT
31+
fi
32+
933
backport:
10-
name: Backport PR
34+
name: Backport PR to ${{ matrix.target }}
35+
needs: get-backport-targets
36+
if: needs.get-backport-targets.outputs.targets != '[]' && needs.get-backport-targets.outputs.targets != ''
1137
runs-on: ubuntu-latest
12-
if: >
13-
github.event.pull_request.merged
14-
&& (
15-
github.event.action == 'closed'
16-
|| (
17-
github.event.action == 'labeled'
18-
&& contains(github.event.label.name, 'backport')
19-
)
20-
)
38+
strategy:
39+
fail-fast: false
40+
matrix:
41+
target: ${{ fromJson(needs.get-backport-targets.outputs.targets) }}
2142
permissions:
2243
id-token: write # This is required for getting the required OIDC token from GitHub
2344
contents: write # This is required for pushing the backport branch
2445
pull-requests: write # This is required for creating the backport PR
2546
steps:
47+
- name: Compute target branch
48+
id: target
49+
run: |
50+
target="${{ matrix.target }}"
51+
target_branch="${target/backport\//}"
52+
echo "target_branch=$target_branch" >> $GITHUB_OUTPUT
53+
2654
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
2755
id: octo-sts
2856
with:
@@ -32,7 +60,7 @@ jobs:
3260
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3361
with:
3462
fetch-depth: 0 # needed to get the full history of the PR
35-
63+
3664
- name: Install dda
3765
uses: ./.github/actions/install-dda
3866
with:
@@ -43,12 +71,12 @@ jobs:
4371
env:
4472
GITHUB_TOKEN: ${{ steps.octo-sts.outputs.token }}
4573
GITHUB_EVENT_PATH: ${{ github.event_path }}
46-
run: dda gh cherry-pick-pr
74+
run: dda gh cherry-pick-pr --target-branch "${{ steps.target.outputs.target_branch }}"
4775

4876
- name: Reset cherry-pick
4977
if: steps.cherry-pick.outputs.base != ''
5078
run: git reset HEAD~1
51-
79+
5280
- name: Create pull request
5381
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
5482
if: steps.cherry-pick.outputs.base != ''
@@ -60,15 +88,15 @@ jobs:
6088
title: "[Backport ${{steps.cherry-pick.outputs.base}}] ${{steps.cherry-pick.outputs.original_title}}"
6189
body: |
6290
Backport ${{steps.cherry-pick.outputs.merge_commit_sha}} from #${{steps.cherry-pick.outputs.original_pr_number}}.
63-
91+
6492
___
65-
93+
6694
${{ steps.cherry-pick.outputs.original_body }}
67-
95+
6896
labels: ${{ steps.cherry-pick.outputs.original_labels }},backport,bot
6997
commit-message: |
7098
${{ steps.cherry-pick.outputs.message }}
71-
99+
72100
___
73-
101+
74102
Co-authored-by: ${{ steps.cherry-pick.outputs.author }}

‎.gitlab/.post/post_rc_build/post_rc_tasks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ update_rc_build_links:
2323
- ATLASSIAN_USERNAME=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $ATLASSIAN_WRITE user) || exit $?; export ATLASSIAN_USERNAME
2424
- dda self dep sync -f legacy-tasks
2525
- PATCH=$(echo "$CI_COMMIT_REF_NAME" | cut -d'.' -f3 | cut -c1)
26-
- if [[ "$PATCH" == "0" ]]; then PATCH_OPTION=""; else PATCH_OPTION="-p"; fi
27-
- dda inv -- -e release.update-build-links ${CI_COMMIT_REF_NAME} ${PATCH_OPTION}
26+
# Do not run this task for patch releases
27+
- if [[ "$PATCH" == "0" ]]; then dda inv -- -e release.update-build-links ${CI_COMMIT_REF_NAME}; fi

‎.gitlab/build/bazel/lint.yml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,22 @@ bazel:mod-deps:
22
extends: .bazel:runner:linux-amd64
33
stage: lint
44
script:
5-
- |
6-
if ! bazel mod deps --lockfile_mode=error; then
7-
echo >&2 "🟡️ triggering in-memory cache refresh to try again"
8-
bazel mod deps --lockfile_mode=refresh
9-
git diff --exit-code || git restore MODULE.bazel.lock
10-
bazel mod deps --lockfile_mode=error
11-
fi
5+
# Why not `bazel mod deps --lockfile_mode=error`:
6+
# 1. `bazel` servers on persistent runners cache non-local repository rules, causing stale checks (#incident-46079),
7+
# 2. `--lockfile_mode=error` doesn't print discrepancies exhaustively, especially on rules_* lock files.
8+
#
9+
# Instead:
10+
# 1. use `--lockfile_mode=refresh` to forcibly re-evaluate non-local repository rules,
11+
# 2. use `--repo_env=REPIN=1` to regenerate rules_* lock files:
12+
# - rules_jvm_external: implies RULES_JVM_EXTERNAL_REPIN=1 for maven_install.json,
13+
# - rules_rust: implies CARGO_BAZEL_REPIN=1 for Cargo.Bazel.lock,
14+
# 3. use `git diff --exit-code` to still fail on any discrepancies while printing them exhaustively.
15+
- bazel mod deps --lockfile_mode=refresh --repo_env=REPIN=1
16+
- git diff --exit-code
1217
after_script:
1318
- |-
1419
if [ $CI_JOB_STATUS = failed ]; then
15-
echo >&2 "💡 bazel mod deps"
20+
echo >&2 "💡 bazel mod deps --repo_env=REPIN=1"
1621
fi
1722
1823
bazel:mod-tidy:

‎.gitlab/deploy/dev_container_deploy/e2e.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ qa_agent:
1414
variables:
1515
IMG_REGISTRIES: agent-qa
1616
IMG_SOURCES: ${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-arm64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-win1809-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-winltsc2022-amd64
17-
IMG_DESTINATIONS: agent:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
17+
IMG_DESTINATIONS: agent-qa:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
1818

1919
qa_agent_fips:
2020
extends: .docker_publish_job_definition
@@ -30,7 +30,7 @@ qa_agent_fips:
3030
variables:
3131
IMG_REGISTRIES: agent-qa
3232
IMG_SOURCES: ${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips-arm64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips-winltsc2022-servercore-amd64
33-
IMG_DESTINATIONS: agent:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-fips
33+
IMG_DESTINATIONS: agent-qa:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-fips
3434

3535
qa_agent_jmx:
3636
extends: .docker_publish_job_definition
@@ -46,7 +46,7 @@ qa_agent_jmx:
4646
variables:
4747
IMG_REGISTRIES: agent-qa
4848
IMG_SOURCES: ${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx-arm64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx-win1809-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx-winltsc2022-amd64
49-
IMG_DESTINATIONS: agent:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-jmx
49+
IMG_DESTINATIONS: agent-qa:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-jmx
5050

5151
qa_agent_fips_jmx:
5252
extends: .docker_publish_job_definition
@@ -62,7 +62,7 @@ qa_agent_fips_jmx:
6262
variables:
6363
IMG_REGISTRIES: agent-qa
6464
IMG_SOURCES: ${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips-jmx-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips-jmx-arm64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips-jmx-winltsc2022-servercore-amd64
65-
IMG_DESTINATIONS: agent:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-fips-jmx
65+
IMG_DESTINATIONS: agent-qa:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-fips-jmx
6666

6767
qa_agent_full:
6868
extends: .docker_publish_job_definition
@@ -76,7 +76,7 @@ qa_agent_full:
7676
variables:
7777
IMG_REGISTRIES: agent-qa
7878
IMG_SOURCES: ${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-full-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-full-arm64
79-
IMG_DESTINATIONS: agent:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-full
79+
IMG_DESTINATIONS: agent-qa:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-full
8080

8181
qa_ot_agent_standalone:
8282
extends: .docker_publish_job_definition
@@ -90,7 +90,7 @@ qa_ot_agent_standalone:
9090
variables:
9191
IMG_REGISTRIES: agent-qa
9292
IMG_SOURCES: ${SRC_OTEL_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-amd64,${SRC_OTEL_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-arm64
93-
IMG_DESTINATIONS: otel-agent:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
93+
IMG_DESTINATIONS: otel-agent-qa:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
9494

9595
qa_dca:
9696
extends: .docker_publish_job_definition
@@ -105,7 +105,7 @@ qa_dca:
105105
variables:
106106
IMG_REGISTRIES: agent-qa
107107
IMG_SOURCES: ${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-amd64,${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-arm64
108-
IMG_DESTINATIONS: cluster-agent:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
108+
IMG_DESTINATIONS: cluster-agent-qa:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
109109

110110
qa_dca_fips:
111111
extends: .docker_publish_job_definition
@@ -120,7 +120,7 @@ qa_dca_fips:
120120
variables:
121121
IMG_REGISTRIES: agent-qa
122122
IMG_SOURCES: ${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-fips-amd64,${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-fips-arm64
123-
IMG_DESTINATIONS: cluster-agent:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-fips
123+
IMG_DESTINATIONS: cluster-agent-qa:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-fips
124124

125125
qa_dogstatsd:
126126
extends: .docker_publish_job_definition
@@ -135,7 +135,7 @@ qa_dogstatsd:
135135
variables:
136136
IMG_REGISTRIES: agent-qa
137137
IMG_SOURCES: ${SRC_DSD}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-amd64,${SRC_DSD}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-arm64
138-
IMG_DESTINATIONS: dogstatsd:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
138+
IMG_DESTINATIONS: dogstatsd-qa:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
139139

140140
.qa_cws_instrumentation:
141141
extends: .docker_publish_job_definition
@@ -146,7 +146,7 @@ qa_dogstatsd:
146146
variables:
147147
IMG_REGISTRIES: agent-qa
148148
IMG_SOURCES: ${SRC_CWS_INSTRUMENTATION}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-amd64,${SRC_CWS_INSTRUMENTATION}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-arm64
149-
IMG_DESTINATIONS: cws-instrumentation:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
149+
IMG_DESTINATIONS: cws-instrumentation-qa:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
150150

151151
qa_cws_instrumentation:
152152
extends: .qa_cws_instrumentation

‎.gitlab/test/functional_test/static_quality_gate.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ static_quality_gates:
4444
# `datadog-ci` relies on `DATADOG_API_KEY` so we get that here.
4545
- DATADOG_API_KEY="$("$CI_PROJECT_DIR"/tools/ci/fetch_secret.sh "$AGENT_API_KEY_ORG2" token)" || exit $?; export DATADOG_API_KEY
4646
- export DD_API_KEY="$DATADOG_API_KEY"
47+
# DD_APP_KEY is required for querying metrics (e.g., fetching ancestor metrics for relative size calculation)
48+
- DD_APP_KEY="$("$CI_PROJECT_DIR"/tools/ci/fetch_secret.sh "$AGENT_APP_KEY_ORG2" token)" || exit $?; export DD_APP_KEY
4749
- !reference [ .setup_agent_github_app ]
4850
- SLACK_DATADOG_AGENT_BOT_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $SLACK_AGENT token) || exit $?; export SLACK_DATADOG_AGENT_BOT_TOKEN
4951
- dda inv -- quality-gates.parse-and-trigger-gates || exit $?

0 commit comments

Comments
 (0)