Skip to content

fix(devcontainer): add platform option for amd64 images#47757

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 4 commits intomainfrom
dev/wassim.dhif/devcontainer-setup-amd64
Mar 20, 2026
Merged

fix(devcontainer): add platform option for amd64 images#47757
gh-worker-dd-mergequeue-cf854d[bot] merged 4 commits intomainfrom
dev/wassim.dhif/devcontainer-setup-amd64

Conversation

@wdhif
Copy link
Copy Markdown
Member

@wdhif wdhif commented Mar 12, 2026

What does this PR do?

Adds an explicit --platform=linux/amd64 run argument when the devcontainer image is an amd64 image, so Docker runs it with the correct architecture.

Motivation

On hosts where Docker may default to a different platform (e.g., Apple Silicon), amd64 devcontainer images can be pulled/run with the wrong architecture/emulation unless the platform is specified.

Describe how you validated your changes

  • Ran the devcontainer setup task and verified the generated runArgs includes --platform=linux/amd64 when using an amd64 devcontainer image.
datadog@28976e101240:/workspaces/datadog-agent-primary$ uname -a
Linux 28976e101240 6.12.72-linuxkit #1 SMP Mon Feb 16 11:19:07 UTC 2026 x86_64 x86_64 x86_64 GNU/Linux

Additional Notes

  • Change is limited to tasks/devcontainer.py and only applies when "amd64" is present in the image name.

Signed-off-by: Wassim DHIF <wassim.dhif@datadoghq.com>
@dd-octo-sts dd-octo-sts Bot added internal Identify a non-fork PR team/agent-devx labels Mar 12, 2026
@github-actions github-actions Bot added the short review PR is simple enough to be reviewed quickly label Mar 12, 2026
@dd-octo-sts dd-octo-sts Bot added the team/container-platform The Container Platform Team label Mar 12, 2026
@wdhif wdhif added changelog/no-changelog No changelog entry needed qa/no-code-change No code change in Agent code requiring validation labels Mar 12, 2026
@agent-platform-auto-pr
Copy link
Copy Markdown
Contributor

agent-platform-auto-pr Bot commented Mar 12, 2026

Files inventory check summary

File checks results against ancestor 178cf93a:

Results for datadog-agent_7.78.0~devel.git.760.ba07388.pipeline.103679749-1_amd64.deb:

No change detected

@agent-platform-auto-pr
Copy link
Copy Markdown
Contributor

agent-platform-auto-pr Bot commented Mar 12, 2026

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor 3e13ad5
📊 Static Quality Gates Dashboard
🔗 SQG Job
SOME SIZE DELTAS ARE N/A (ANCESTOR METRICS NOT YET AVAILABLE). RETRY JOB

Successful checks

Info

Quality gate Change Size (prev → curr → max)
agent_deb_amd64 N/A N/A → 750.698 → 750.720
agent_deb_amd64_fips N/A N/A → 707.630 → 711.230
agent_heroku_amd64 N/A N/A → 313.002 → 320.580
agent_rpm_amd64 N/A N/A → 750.682 → 750.690
agent_rpm_amd64_fips N/A N/A → 707.614 → 711.210
agent_rpm_arm64 N/A N/A → 729.014 → 732.890
agent_rpm_arm64_fips N/A N/A → 689.006 → 694.440
agent_suse_amd64 N/A N/A → 750.682 → 750.690
agent_suse_amd64_fips N/A N/A → 707.614 → 711.210
agent_suse_arm64 N/A N/A → 729.014 → 732.890
agent_suse_arm64_fips N/A N/A → 689.006 → 694.440
docker_agent_amd64 N/A N/A → 811.017 → 813.040
docker_agent_arm64 N/A N/A → 814.162 → 819.570
docker_agent_jmx_amd64 N/A N/A → 1001.932 → 1003.920
docker_agent_jmx_arm64 N/A N/A → 993.857 → 999.170
docker_cluster_agent_amd64 N/A N/A → 205.172 → 206.270
docker_cluster_agent_arm64 N/A N/A → 219.549 → 220.000
docker_cws_instrumentation_amd64 N/A N/A → 7.142 → 7.180
docker_cws_instrumentation_arm64 N/A N/A → 6.689 → 6.920
docker_dogstatsd_amd64 N/A N/A → 39.215 → 39.380
docker_dogstatsd_arm64 N/A N/A → 37.445 → 37.940
dogstatsd_deb_amd64 N/A N/A → 29.855 → 30.610
dogstatsd_deb_arm64 N/A N/A → 28.007 → 29.110
dogstatsd_rpm_amd64 N/A N/A → 29.855 → 30.610
dogstatsd_suse_amd64 N/A N/A → 29.855 → 30.610
iot_agent_deb_amd64 N/A N/A → 43.218 → 43.290
iot_agent_deb_arm64 N/A N/A → 40.273 → 40.920
iot_agent_deb_armhf N/A N/A → 41.017 → 41.030
iot_agent_rpm_amd64 N/A N/A → 43.219 → 43.290
iot_agent_suse_amd64 N/A N/A → 43.219 → 43.290
On-wire sizes (compressed)
Quality gate Change Size (prev → curr → max)
agent_deb_amd64 N/A N/A → 174.696 → 177.700
agent_deb_amd64_fips N/A N/A → 165.219 → 172.230
agent_heroku_amd64 N/A N/A → 74.948 → 79.970
agent_rpm_amd64 N/A N/A → 177.589 → 180.780
agent_rpm_amd64_fips N/A N/A → 167.298 → 173.370
agent_rpm_arm64 N/A N/A → 159.591 → 161.610
agent_rpm_arm64_fips N/A N/A → 151.260 → 155.910
agent_suse_amd64 N/A N/A → 177.589 → 180.780
agent_suse_amd64_fips N/A N/A → 167.298 → 173.370
agent_suse_arm64 N/A N/A → 159.591 → 161.610
agent_suse_arm64_fips N/A N/A → 151.260 → 155.910
docker_agent_amd64 N/A N/A → 267.882 → 271.240
docker_agent_arm64 N/A N/A → 255.084 → 259.800
docker_agent_jmx_amd64 N/A N/A → 336.525 → 339.870
docker_agent_jmx_arm64 N/A N/A → 319.722 → 324.390
docker_cluster_agent_amd64 N/A N/A → 71.886 → 72.920
docker_cluster_agent_arm64 N/A N/A → 67.458 → 68.220
docker_cws_instrumentation_amd64 N/A N/A → 2.999 → 3.330
docker_cws_instrumentation_arm64 N/A N/A → 2.729 → 3.090
docker_dogstatsd_amd64 N/A N/A → 15.161 → 15.820
docker_dogstatsd_arm64 N/A N/A → 14.480 → 14.830
dogstatsd_deb_amd64 N/A N/A → 7.886 → 8.790
dogstatsd_deb_arm64 N/A N/A → 6.774 → 7.710
dogstatsd_rpm_amd64 N/A N/A → 7.896 → 8.800
dogstatsd_suse_amd64 N/A N/A → 7.896 → 8.800
iot_agent_deb_amd64 N/A N/A → 11.386 → 12.040
iot_agent_deb_arm64 N/A N/A → 9.696 → 10.450
iot_agent_deb_armhf N/A N/A → 9.929 → 10.620
iot_agent_rpm_amd64 N/A N/A → 11.401 → 12.060
iot_agent_suse_amd64 N/A N/A → 11.401 → 12.060

@cit-pr-commenter-54b7da
Copy link
Copy Markdown

cit-pr-commenter-54b7da Bot commented Mar 13, 2026

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: d34c2eec-c397-4105-8311-4cd0f1c6b0a1

Baseline: 83828e2
Comparison: eb3185d
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.22 [-0.87, +5.32] 1 Logs

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
docker_containers_cpu % cpu utilization +2.22 [-0.87, +5.32] 1 Logs
ddot_metrics_sum_delta memory utilization +0.57 [+0.40, +0.74] 1 Logs
ddot_metrics_sum_cumulative memory utilization +0.52 [+0.38, +0.66] 1 Logs
ddot_metrics_sum_cumulativetodelta_exporter memory utilization +0.37 [+0.15, +0.60] 1 Logs
quality_gate_idle_all_features memory utilization +0.14 [+0.10, +0.18] 1 Logs bounds checks dashboard
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization +0.14 [+0.07, +0.20] 1 Logs
otlp_ingest_logs memory utilization +0.10 [-0.00, +0.19] 1 Logs
file_tree memory utilization +0.09 [+0.04, +0.14] 1 Logs
quality_gate_idle memory utilization +0.09 [+0.04, +0.15] 1 Logs bounds checks dashboard
ddot_logs memory utilization +0.03 [-0.03, +0.08] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.01 [-0.08, +0.09] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.12, +0.11] 1 Logs
uds_dogstatsd_to_api_v3 ingress throughput -0.00 [-0.21, +0.20] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.01 [-0.49, +0.46] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.02 [-0.22, +0.18] 1 Logs
file_to_blackhole_500ms_latency egress throughput -0.05 [-0.44, +0.34] 1 Logs
quality_gate_logs % cpu utilization -0.06 [-1.65, +1.53] 1 Logs bounds checks dashboard
file_to_blackhole_1000ms_latency egress throughput -0.07 [-0.50, +0.36] 1 Logs
docker_containers_memory memory utilization -0.30 [-0.38, -0.22] 1 Logs
ddot_metrics memory utilization -0.57 [-0.75, -0.39] 1 Logs
otlp_ingest_metrics memory utilization -0.84 [-1.00, -0.68] 1 Logs
tcp_syslog_to_blackhole ingress throughput -1.17 [-1.30, -1.04] 1 Logs
quality_gate_metrics_logs memory utilization -1.63 [-1.87, -1.39] 1 Logs bounds checks dashboard

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed observed_value links
docker_containers_cpu simple_check_run 10/10 727 ≥ 26
docker_containers_memory memory_usage 10/10 273.54MiB ≤ 370MiB
docker_containers_memory simple_check_run 10/10 697 ≥ 26
file_to_blackhole_0ms_latency memory_usage 10/10 0.19GiB ≤ 1.20GiB
file_to_blackhole_0ms_latency missed_bytes 10/10 0B = 0B
file_to_blackhole_1000ms_latency memory_usage 10/10 0.23GiB ≤ 1.20GiB
file_to_blackhole_1000ms_latency missed_bytes 10/10 0B = 0B
file_to_blackhole_100ms_latency memory_usage 10/10 0.20GiB ≤ 1.20GiB
file_to_blackhole_100ms_latency missed_bytes 10/10 0B = 0B
file_to_blackhole_500ms_latency memory_usage 10/10 0.21GiB ≤ 1.20GiB
file_to_blackhole_500ms_latency missed_bytes 10/10 0B = 0B
quality_gate_idle intake_connections 10/10 3 = 3 bounds checks dashboard
quality_gate_idle memory_usage 10/10 174.72MiB ≤ 175MiB bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 2 ≤ 3 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 494.17MiB ≤ 550MiB bounds checks dashboard
quality_gate_logs intake_connections 10/10 4 ≤ 6 bounds checks dashboard
quality_gate_logs memory_usage 10/10 203.39MiB ≤ 220MiB bounds checks dashboard
quality_gate_logs missed_bytes 10/10 0B = 0B bounds checks dashboard
quality_gate_metrics_logs cpu_usage 10/10 355.79 ≤ 2000 bounds checks dashboard
quality_gate_metrics_logs intake_connections 10/10 3 ≤ 6 bounds checks dashboard
quality_gate_metrics_logs memory_usage 10/10 409.16MiB ≤ 475MiB bounds checks dashboard
quality_gate_metrics_logs missed_bytes 10/10 0B = 0B 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:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. 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.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

Passed. All Quality Gates 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 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_metrics_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check missed_bytes: 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_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check missed_bytes: 10/10 replicas passed. Gate passed.

@wdhif wdhif marked this pull request as ready for review March 20, 2026 09:16
@wdhif wdhif requested review from a team as code owners March 20, 2026 09:16
Copilot AI review requested due to automatic review settings March 20, 2026 09:16
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the devcontainer configuration generator to explicitly set Docker’s target platform when running an amd64 devcontainer image, avoiding incorrect default platform selection on multi-arch hosts (e.g., Apple Silicon).

Changes:

  • Adds --platform=linux/amd64 to the generated runArgs when the devcontainer image is detected as amd64.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread tasks/devcontainer.py Outdated
Comment thread tasks/devcontainer.py Outdated
@github-actions github-actions Bot added medium review PR review might take time and removed short review PR is simple enough to be reviewed quickly labels Mar 20, 2026
Co-authored-by: Nicolas Schweitzer <nicolas.schweitzer@datadoghq.com>
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot merged commit eb3185d into main Mar 20, 2026
222 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot deleted the dev/wassim.dhif/devcontainer-setup-amd64 branch March 20, 2026 18:16
@github-actions github-actions Bot added this to the 7.79.0 milestone Mar 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog/no-changelog No changelog entry needed internal Identify a non-fork PR medium review PR review might take time qa/no-code-change No code change in Agent code requiring validation team/agent-devx team/container-platform The Container Platform Team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants