Propagate `CI` env to further `docker run`s by rdesgroppes · Pull Request #43662 · DataDog/datadog-agent

rdesgroppes · 2025-12-01T11:36:50Z

What does this PR do?

This is a follow-up of #43274 aiming at ensuring the CI environment variable is propagated to further docker containers started from CI jobs.

Motivation

The CI variable is a de facto standard set by most CI systems (GitHub Actions, GitLab CI, Travis CI, CircleCI, etc.) to indicate code is running in an automated build environment and used by tools such as (but not limited to):

cargo-nextest: automatically hides progress bar when CI is detected,
pipenv: uses non-interactive defaults,
pytest: adjusts output,
...

Additional Notes

-e CI, --env CI and --env=CI are all equivalent,
if CI is absent from the host environment, it's not added to the container.

agent-platform-auto-pr · 2025-12-01T11:40:35Z

Gitlab CI Configuration Changes

Updated: .gitlab-ci.yml

Modified Jobs

powershell_script_signing

  powershell_script_signing:
    artifacts:
      expire_in: 2 weeks
      paths:
      - $WINDOWS_POWERSHELL_DIR
    needs: []
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - mkdir $WINDOWS_POWERSHELL_DIR
-   - docker run --rm -v "$(Get-Location):c:\mnt" -e AWS_NETWORKING=true -e IS_AWS_CONTAINER=true
+   - docker run --rm -v "$(Get-Location):c:\mnt" -e AWS_NETWORKING=true -e CI -e IS_AWS_CONTAINER=true
?                                                                           ++++++
      ${WINBUILDIMAGE} powershell -C "dd-wcs sign \mnt\tools\windows\DatadogAgentInstallScript\Install-Datadog.ps1"
    - copy .\tools\windows\DatadogAgentInstallScript\Install-Datadog.ps1 $WINDOWS_POWERSHELL_DIR\Install-Datadog.ps1
    stage: package_build
    tags:
    - windows-v2:2022
    variables:
      ARCH: x64
      OVERRIDE_GIT_STRATEGY: clone
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}

Changes Summary

Removed	Modified	Added	Renamed
0	1	0	0

Updated: .gitlab/trigger_distribution/include.yml

Modified Jobs

publish_winget_7_x64

  publish_winget_7_x64:
    before_script:
    - $tmpfile = [System.IO.Path]::GetTempFileName()
    - (& "$CI_PROJECT_DIR\tools\ci\fetch_secret.ps1" -parameterName "$Env:WINGET_PAT"
      -tempFile "$tmpfile")
    - If ($lastExitCode -ne "0") { exit "$lastExitCode" }
    - $wingetPat=$(cat "$tmpfile")
    - Remove-Item "$tmpfile"
    dependencies: []
    rules:
    - if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      when: never
    - allow_failure: true
      when: manual
    script:
    - $ErrorActionPreference = "Stop"
-   - 'docker run --rm -v "$(Get-Location):c:\mnt" -e WINGET_GITHUB_ACCESS_TOKEN=${wingetPat}
+   - 'docker run --rm -v "$(Get-Location):c:\mnt" -e CI -e WINGET_GITHUB_ACCESS_TOKEN=${wingetPat}
?                                                     ++++++
      -e GENERAL_ARTIFACTS_CACHE_BUCKET_URL ${WINBUILDIMAGE} Powershell -C "C:\mnt\tasks\winbuildscripts\Update-Winget.ps1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: deploy_packages
    tags:
    - windows-v2:2022
    variables:
      ARCH: x64
      OVERRIDE_GIT_STRATEGY: clone
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}

Changes Summary

Removed	Modified	Added	Renamed
0	1	0	0

ℹ️ Diff available in the job log.

agent-platform-auto-pr · 2025-12-01T12:20:12Z

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor f3e5cec

Successful checks

Info

	Quality gate	Delta	On disk size (MiB)	Delta	On wire size (MiB)
✅	agent_deb_amd64	$${0}$$	$${705.21}$$ < $${706.32}$$	$${-0.01}$$	$${172.94}$$ < $${173.81}$$
✅	agent_deb_amd64_fips	$${0}$$	$${700.06}$$ < $${701.16}$$	$${-0.01}$$	$${171.73}$$ < $${172.71}$$
✅	agent_heroku_amd64	$${0}$$	$${326.41}$$ < $${327.69}$$	$${-0}$$	$${87.34}$$ < $${88.19}$$
✅	agent_msi	$${0}$$	$${969.43}$$ < $${982.08}$$	$${+0.01}$$	$${141.45}$$ < $${143.01}$$
✅	agent_rpm_amd64	$${0}$$	$${705.2}$$ < $${706.31}$$	$${-0}$$	$${175.97}$$ < $${176.86}$$
✅	agent_rpm_amd64_fips	$${0}$$	$${700.04}$$ < $${701.15}$$	$${+0}$$	$${174.02}$$ < $${174.95}$$
✅	agent_rpm_arm64	$${0}$$	$${690.86}$$ < $${691.67}$$	$${+0.05}$$	$${159.79}$$ < $${160.7}$$
✅	agent_rpm_arm64_fips	$${0}$$	$${686.68}$$ < $${687.54}$$	$${-0.01}$$	$${159.14}$$ < $${160.1}$$
✅	agent_suse_amd64	$${0}$$	$${705.2}$$ < $${706.31}$$	$${-0}$$	$${175.97}$$ < $${176.86}$$
✅	agent_suse_amd64_fips	$${0}$$	$${700.04}$$ < $${701.15}$$	$${+0}$$	$${174.02}$$ < $${174.95}$$
✅	agent_suse_arm64	$${0}$$	$${690.86}$$ < $${691.67}$$	$${+0.05}$$	$${159.79}$$ < $${160.7}$$
✅	agent_suse_arm64_fips	$${0}$$	$${686.68}$$ < $${687.54}$$	$${-0.01}$$	$${159.14}$$ < $${160.1}$$
✅	docker_agent_amd64	$${-0}$$	$${767.54}$$ < $${768.66}$$	$${-0}$$	$${260.63}$$ < $${261.52}$$
✅	docker_agent_arm64	$${0}$$	$${777.48}$$ < $${778.35}$$	$${-0}$$	$${250.81}$$ < $${251.72}$$
✅	docker_agent_jmx_amd64	$${0}$$	$${958.41}$$ < $${959.54}$$	$${-0}$$	$${329.26}$$ < $${330.15}$$
✅	docker_agent_jmx_arm64	$${+0}$$	$${957.08}$$ < $${957.95}$$	$${-0}$$	$${315.43}$$ < $${316.35}$$
✅	docker_cluster_agent_amd64	$${0}$$	$${178.88}$$ < $${179.28}$$	$${-0}$$	$${63.17}$$ < $${63.96}$$
✅	docker_cluster_agent_arm64	$${+0}$$	$${196.39}$$ < $${196.79}$$	$${+0}$$	$${59.89}$$ < $${60.69}$$
✅	docker_cws_instrumentation_amd64	$${0}$$	$${7.07}$$ < $${7.12}$$	$${0}$$	$${2.95}$$ < $${3.29}$$
✅	docker_cws_instrumentation_arm64	$${0}$$	$${6.69}$$ < $${6.92}$$	$${0}$$	$${2.7}$$ < $${3.07}$$
✅	docker_dogstatsd_amd64	$${0}$$	$${38.6}$$ < $${39.3}$$	$${0}$$	$${14.91}$$ < $${15.76}$$
✅	docker_dogstatsd_arm64	$${0}$$	$${37.3}$$ < $${37.94}$$	$${0}$$	$${14.36}$$ < $${14.83}$$
✅	dogstatsd_deb_amd64	$${0}$$	$${29.82}$$ < $${30.53}$$	$${-0}$$	$${7.86}$$ < $${8.75}$$
✅	dogstatsd_deb_arm64	$${0}$$	$${28.33}$$ < $${29.11}$$	$${-0}$$	$${6.8}$$ < $${7.71}$$
✅	dogstatsd_rpm_amd64	$${0}$$	$${29.82}$$ < $${30.53}$$	$${-0}$$	$${7.88}$$ < $${8.76}$$
✅	dogstatsd_suse_amd64	$${0}$$	$${29.82}$$ < $${30.53}$$	$${-0}$$	$${7.88}$$ < $${8.76}$$
✅	iot_agent_deb_amd64	$${0}$$	$${42.59}$$ < $${43.19}$$	$${-0}$$	$${11.12}$$ < $${11.98}$$
✅	iot_agent_deb_arm64	$${0}$$	$${40.33}$$ < $${40.92}$$	$${-0}$$	$${9.58}$$ < $${10.45}$$
✅	iot_agent_deb_armhf	$${0}$$	$${40.23}$$ < $${40.86}$$	$${+0}$$	$${9.69}$$ < $${10.56}$$
✅	iot_agent_rpm_amd64	$${0}$$	$${42.59}$$ < $${43.19}$$	$${-0}$$	$${11.14}$$ < $${12.0}$$
✅	iot_agent_suse_amd64	$${0}$$	$${42.59}$$ < $${43.19}$$	$${-0}$$	$${11.14}$$ < $${12.0}$$

cit-pr-commenter · 2025-12-01T12:24:42Z

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 1ce6d8f4-64e9-42d8-9253-d12b0bd43cc1

Baseline: f3e5cec
Comparison: 66e0780
Diff

Optimization Goals: ✅ No significant changes detected

Experiments ignored for regressions

Regressions in experiments with settings containing erratic: true are ignored.

perf	experiment	goal	Δ mean %	Δ mean % CI	trials	links
➖	docker_containers_cpu	% cpu utilization	+2.05	[-0.91, +5.00]	1	Logs

Fine details of change detection per experiment

perf	experiment	goal	Δ mean %	Δ mean % CI	trials	links
➖	docker_containers_cpu	% cpu utilization	+2.05	[-0.91, +5.00]	1	Logs
➖	quality_gate_metrics_logs	memory utilization	+0.82	[+0.60, +1.03]	1	Logs bounds checks dashboard
➖	quality_gate_idle_all_features	memory utilization	+0.75	[+0.69, +0.80]	1	Logs bounds checks dashboard
➖	tcp_syslog_to_blackhole	ingress throughput	+0.63	[+0.55, +0.71]	1	Logs
➖	otlp_ingest_logs	memory utilization	+0.42	[+0.33, +0.51]	1	Logs
➖	ddot_metrics_sum_cumulativetodelta_exporter	memory utilization	+0.35	[+0.11, +0.59]	1	Logs
➖	quality_gate_logs	% cpu utilization	+0.30	[-1.15, +1.75]	1	Logs bounds checks dashboard
➖	ddot_metrics_sum_cumulative	memory utilization	+0.27	[+0.10, +0.43]	1	Logs
➖	docker_containers_memory	memory utilization	+0.10	[+0.01, +0.19]	1	Logs
➖	ddot_metrics_sum_delta	memory utilization	+0.05	[-0.15, +0.25]	1	Logs
➖	quality_gate_idle	memory utilization	+0.03	[-0.02, +0.08]	1	Logs bounds checks dashboard
➖	ddot_metrics	memory utilization	+0.01	[-0.22, +0.25]	1	Logs
➖	uds_dogstatsd_to_api	ingress throughput	+0.01	[-0.11, +0.14]	1	Logs
➖	ddot_logs	memory utilization	+0.01	[-0.06, +0.08]	1	Logs
➖	file_tree	memory utilization	-0.00	[-0.05, +0.05]	1	Logs
➖	uds_dogstatsd_to_api_v3	ingress throughput	-0.00	[-0.14, +0.13]	1	Logs
➖	tcp_dd_logs_filter_exclude	ingress throughput	-0.00	[-0.08, +0.07]	1	Logs
➖	file_to_blackhole_1000ms_latency	egress throughput	-0.00	[-0.41, +0.41]	1	Logs
➖	file_to_blackhole_100ms_latency	egress throughput	-0.01	[-0.06, +0.04]	1	Logs
➖	uds_dogstatsd_20mb_12k_contexts_20_senders	memory utilization	-0.07	[-0.12, -0.01]	1	Logs
➖	file_to_blackhole_0ms_latency	egress throughput	-0.07	[-0.49, +0.35]	1	Logs
➖	file_to_blackhole_500ms_latency	egress throughput	-0.08	[-0.45, +0.30]	1	Logs
➖	otlp_ingest_metrics	memory utilization	-0.32	[-0.47, -0.17]	1	Logs

Bounds Checks: ✅ Passed

perf	experiment	bounds_check_name	replicates_passed	links
✅	docker_containers_cpu	simple_check_run	10/10
✅	docker_containers_memory	memory_usage	10/10
✅	docker_containers_memory	simple_check_run	10/10
✅	file_to_blackhole_0ms_latency	lost_bytes	10/10
✅	file_to_blackhole_0ms_latency	memory_usage	10/10
✅	file_to_blackhole_1000ms_latency	lost_bytes	10/10
✅	file_to_blackhole_1000ms_latency	memory_usage	10/10
✅	file_to_blackhole_100ms_latency	lost_bytes	10/10
✅	file_to_blackhole_100ms_latency	memory_usage	10/10
✅	file_to_blackhole_500ms_latency	lost_bytes	10/10
✅	file_to_blackhole_500ms_latency	memory_usage	10/10
✅	quality_gate_idle	intake_connections	10/10	bounds checks dashboard
✅	quality_gate_idle	memory_usage	10/10	bounds checks dashboard
✅	quality_gate_idle_all_features	intake_connections	10/10	bounds checks dashboard
✅	quality_gate_idle_all_features	memory_usage	10/10	bounds checks dashboard
✅	quality_gate_logs	intake_connections	10/10	bounds checks dashboard
✅	quality_gate_logs	lost_bytes	10/10	bounds checks dashboard
✅	quality_gate_logs	memory_usage	10/10	bounds checks dashboard
✅	quality_gate_metrics_logs	cpu_usage	10/10	bounds checks dashboard
✅	quality_gate_metrics_logs	intake_connections	10/10	bounds checks dashboard
✅	quality_gate_metrics_logs	lost_bytes	10/10	bounds checks dashboard
✅	quality_gate_metrics_logs	memory_usage	10/10	bounds checks dashboard

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

✅ = significantly better comparison variant performance
❌ = significantly worse comparison variant performance
➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.
Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.
Its configuration does not mark it "erratic".

CI Pass/Fail Decision

✅ Passed. All Quality Gates passed.

quality_gate_metrics_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
quality_gate_metrics_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
quality_gate_metrics_logs, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
quality_gate_metrics_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.

tasks/security_agent.py

tasks/kernel_matrix_testing/compiler.py

This is a follow-up of #43274 aiming at ensure the `CI` environment variable is propagated to all docker containers started from CI jobs. The `CI` variable is a de facto standard set by most CI systems (GitHub Actions, GitLab CI, Travis CI, CircleCI, etc.) to indicate code is running in an automated build environment and used by tools like: - `cargo-nextest`: automatically hides progress bar when CI is detected - `pipenv`: uses non-interactive defaults - `pytest`: adjusts output Notes: - `-e CI` and `--env=CI` are all equivalent, - if `CI` is absent from the host environment, it's not added to the container.

…ever be run in CI

rdesgroppes · 2025-12-04T07:07:16Z

/merge

dd-devflow-routing-codex · 2025-12-04T07:07:20Z

View all feedbacks in Devflow UI.

2025-12-04 07:07:20 UTC ℹ️ Start processing command /merge

2025-12-04 07:07:24 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in main is approximately 41m (p90).

2025-12-04 07:25:01 UTC ℹ️ MergeQueue: This merge request was merged

rdesgroppes added changelog/no-changelog No changelog entry needed qa/no-code-change No code change in Agent code requiring validation labels Dec 1, 2025

github-actions bot added the medium review PR review might take time label Dec 1, 2025

rdesgroppes marked this pull request as ready for review December 1, 2025 15:35

rdesgroppes requested review from a team as code owners December 1, 2025 15:35

paulcacheux reviewed Dec 1, 2025

View reviewed changes

tasks/security_agent.py Show resolved Hide resolved

paulcacheux approved these changes Dec 1, 2025

View reviewed changes

rdesgroppes force-pushed the regis.desgroppes/add-ci-env-to-docker-run branch from c189024 to 2d40860 Compare December 1, 2025 23:45

rdesgroppes changed the title ~~Pass CI environment variable to more docker run commands~~ Pass CI environment variable to more docker run commands Dec 2, 2025

rdesgroppes changed the title ~~Pass CI environment variable to more docker run commands~~ [ABLD-300] Pass CI environment variable to more docker run commands Dec 2, 2025

rdesgroppes changed the title ~~[ABLD-300] Pass CI environment variable to more docker run commands~~ [ABLD-300] Propagate CI env to more docker run commands Dec 2, 2025

rdesgroppes changed the title ~~[ABLD-300] Propagate CI env to more docker run commands~~ [ABLD-300] Propagate CI env to futher docker runs Dec 2, 2025

rdesgroppes changed the title ~~[ABLD-300] Propagate CI env to futher docker runs~~ [ABLD-300] Propagate CI env to further docker runs Dec 2, 2025

brycekahle reviewed Dec 3, 2025

View reviewed changes

tasks/kernel_matrix_testing/compiler.py Outdated Show resolved Hide resolved

rdesgroppes added 2 commits December 3, 2025 18:44

Removed from there because they are 100% sure that none of this will …

66e0780

…ever be run in CI

rdesgroppes force-pushed the regis.desgroppes/add-ci-env-to-docker-run branch from 2d40860 to 66e0780 Compare December 3, 2025 17:49

rdesgroppes added the ask-review Ask required teams to review this PR label Dec 3, 2025

rdesgroppes changed the title ~~[ABLD-300] Propagate CI env to further docker runs~~ Propagate CI env to further docker runs Dec 3, 2025

aiuto approved these changes Dec 4, 2025

View reviewed changes

FlorentClarret approved these changes Dec 4, 2025

View reviewed changes

dd-mergequeue bot merged commit 04b51c4 into main Dec 4, 2025
415 checks passed

dd-mergequeue bot deleted the regis.desgroppes/add-ci-env-to-docker-run branch December 4, 2025 07:25

github-actions bot added this to the 7.75.0 milestone Dec 4, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Propagate `CI` env to further `docker run`s#43662

Propagate `CI` env to further `docker run`s#43662
dd-mergequeue[bot] merged 2 commits intomainfrom
regis.desgroppes/add-ci-env-to-docker-run

rdesgroppes commented Dec 1, 2025 •

edited

Loading

Uh oh!

agent-platform-auto-pr bot commented Dec 1, 2025 •

edited

Loading

Updated: .gitlab-ci.yml

Modified Jobs

Changes Summary

Updated: .gitlab/trigger_distribution/include.yml

Modified Jobs

Changes Summary

Uh oh!

agent-platform-auto-pr bot commented Dec 1, 2025 •

edited

Loading

Info

Uh oh!

cit-pr-commenter bot commented Dec 1, 2025 •

edited

Loading

Experiments ignored for regressions

Fine details of change detection per experiment

Bounds Checks: ✅ Passed

Explanation

Uh oh!

Uh oh!

Uh oh!

rdesgroppes commented Dec 4, 2025

Uh oh!

dd-devflow-routing-codex bot commented Dec 4, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

rdesgroppes commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Motivation

Additional Notes

Uh oh!

agent-platform-auto-pr bot commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Gitlab CI Configuration Changes

Updated: .gitlab-ci.yml

Modified Jobs

Changes Summary

Updated: .gitlab/trigger_distribution/include.yml

Modified Jobs

Changes Summary

Uh oh!

agent-platform-auto-pr bot commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Static quality checks

Info

Uh oh!

cit-pr-commenter bot commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Regression Detector

Regression Detector Results

Optimization Goals: ✅ No significant changes detected

Experiments ignored for regressions

Fine details of change detection per experiment

Bounds Checks: ✅ Passed

Explanation

CI Pass/Fail Decision

Uh oh!

Uh oh!

Uh oh!

rdesgroppes commented Dec 4, 2025

Uh oh!

dd-devflow-routing-codex bot commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

rdesgroppes commented Dec 1, 2025 •

edited

Loading

agent-platform-auto-pr bot commented Dec 1, 2025 •

edited

Loading

agent-platform-auto-pr bot commented Dec 1, 2025 •

edited

Loading

cit-pr-commenter bot commented Dec 1, 2025 •

edited

Loading

dd-devflow-routing-codex bot commented Dec 4, 2025 •

edited

Loading