Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CONTINT-4635] Resolve Docker Image Layer Digest Bug #35543

Merged
merged 8 commits into from
Apr 3, 2025

Conversation

justin-lesko
Copy link
Contributor

@justin-lesko justin-lesko commented Mar 27, 2025

What does this PR do?

Background

We previously identified a pattern between the outputs of the docker history and docker inspect commands. Layers from docker history without Size or Created By matched with the layer digests from docker inspect. More details can be found in the original PR description #33384.

Changes Introduced

This PR prevents the agent from panicking when attempting to match docker inspect digests to docker history layers; if there is a mismatch in layers detected, the code falls back to its previous behavior.

Motivation

Resolve a bug report.

Describe how you validated your changes

Wrote a unit test to replicate the behavior described in the bug report.

Possible Drawbacks / Trade-offs

Additional Notes

We reached out to the customer for more details on the specific image that caused this panic. For now, I am unable to reproduce and test with anything other than unit tests.

@github-actions github-actions bot added short review PR is simple enough to be reviewed quickly team/container-platform The Container Platform Team labels Mar 27, 2025
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Mar 27, 2025

Test changes on VM

Use this command from test-infra-definitions to manually test this PR changes on a VM:

dda inv aws.create-vm --pipeline-id=60965819 --os-family=ubuntu

Note: This applies to commit dc6f09d

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Mar 27, 2025

Uncompressed package size comparison

Comparison with ancestor 64573926f5a68a1f81ca341b0137490c1da18c0f

Diff per package
package diff status size ancestor threshold
datadog-agent-amd64-deb 0.00MB 797.08MB 797.08MB 0.50MB
datadog-agent-x86_64-rpm 0.00MB 806.95MB 806.95MB 0.50MB
datadog-agent-x86_64-suse 0.00MB 806.95MB 806.95MB 0.50MB
datadog-agent-arm64-deb 0.00MB 787.85MB 787.85MB 0.50MB
datadog-agent-aarch64-rpm 0.00MB 797.70MB 797.70MB 0.50MB
datadog-dogstatsd-amd64-deb 0.00MB 39.71MB 39.71MB 0.50MB
datadog-dogstatsd-x86_64-rpm 0.00MB 39.79MB 39.79MB 0.50MB
datadog-dogstatsd-x86_64-suse 0.00MB 39.79MB 39.79MB 0.50MB
datadog-dogstatsd-arm64-deb 0.00MB 38.23MB 38.23MB 0.50MB
datadog-heroku-agent-amd64-deb 0.00MB 440.95MB 440.95MB 0.50MB
datadog-iot-agent-amd64-deb 0.00MB 60.48MB 60.48MB 0.50MB
datadog-iot-agent-x86_64-rpm 0.00MB 60.55MB 60.55MB 0.50MB
datadog-iot-agent-x86_64-suse 0.00MB 60.55MB 60.55MB 0.50MB
datadog-iot-agent-arm64-deb 0.00MB 57.80MB 57.80MB 0.50MB
datadog-iot-agent-aarch64-rpm 0.00MB 57.87MB 57.87MB 0.50MB

Decision

✅ Passed

Copy link

cit-pr-commenter bot commented Mar 27, 2025

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 6e1341d2-23c0-4553-a81a-fa1157f42229

Baseline: aebece8
Comparison: dc6f09d
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
uds_dogstatsd_to_api_cpu % cpu utilization +3.97 [+3.12, +4.81] 1 Logs
otlp_ingest_traces memory utilization +0.73 [+0.35, +1.11] 1 Logs
quality_gate_logs % cpu utilization +0.56 [-2.26, +3.38] 1 Logs
file_tree memory utilization +0.26 [+0.14, +0.39] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.13 [-0.63, +0.88] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput +0.11 [-0.35, +0.58] 1 Logs
otlp_ingest_metrics memory utilization +0.11 [-0.03, +0.26] 1 Logs
quality_gate_idle memory utilization +0.11 [+0.05, +0.16] 1 Logs bounds checks dashboard
file_to_blackhole_100ms_latency egress throughput +0.01 [-0.70, +0.72] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput +0.00 [-0.80, +0.80] 1 Logs
file_to_blackhole_300ms_latency egress throughput +0.00 [-0.63, +0.63] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.00 [-0.79, +0.79] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.02, +0.02] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.01 [-0.29, +0.28] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput -0.02 [-0.86, +0.82] 1 Logs
file_to_blackhole_500ms_latency egress throughput -0.04 [-0.82, +0.75] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.55 [-0.59, -0.51] 1 Logs
tcp_syslog_to_blackhole ingress throughput -0.69 [-0.77, -0.62] 1 Logs
otlp_ingest_logs memory utilization -1.17 [-1.33, -1.01] 1 Logs
quality_gate_idle_all_features memory utilization -1.22 [-1.33, -1.11] 1 Logs bounds checks dashboard

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed links
file_to_blackhole_0ms_latency lost_bytes 10/10
file_to_blackhole_0ms_latency memory_usage 10/10
file_to_blackhole_0ms_latency_http1 lost_bytes 10/10
file_to_blackhole_0ms_latency_http1 memory_usage 10/10
file_to_blackhole_0ms_latency_http2 lost_bytes 10/10
file_to_blackhole_0ms_latency_http2 memory_usage 10/10
file_to_blackhole_1000ms_latency memory_usage 10/10
file_to_blackhole_1000ms_latency_linear_load 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_300ms_latency lost_bytes 10/10
file_to_blackhole_300ms_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
quality_gate_logs lost_bytes 10/10
quality_gate_logs memory_usage 10/10

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_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_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_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.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Mar 27, 2025

Static quality checks ✅

Please find below the results from static quality gates

Successful checks

Info

Result Quality gate On disk size On disk size limit On wire size On wire size limit
static_quality_gate_agent_deb_amd64 771.26 MiB 780.74 MiB 189.34 MiB 190.85 MiB
static_quality_gate_agent_deb_amd64_fips 769.23 MiB 778.65 MiB 188.62 MiB 190.66 MiB
static_quality_gate_agent_heroku_amd64 428.05 MiB 428.97 MiB 112.79 MiB 113.11 MiB
static_quality_gate_agent_msi 976.28 MiB 977.0 MiB 149.43 MiB 149.85 MiB
static_quality_gate_agent_rpm_amd64 771.25 MiB 780.59 MiB 191.0 MiB 193.37 MiB
static_quality_gate_agent_rpm_amd64_fips 769.21 MiB 778.69 MiB 190.65 MiB 192.47 MiB
static_quality_gate_agent_rpm_arm64 762.42 MiB 772.07 MiB 173.66 MiB 174.47 MiB
static_quality_gate_agent_rpm_arm64_fips 760.59 MiB 770.27 MiB 172.33 MiB 173.63 MiB
static_quality_gate_agent_suse_amd64 771.25 MiB 780.7 MiB 191.0 MiB 193.37 MiB
static_quality_gate_agent_suse_amd64_fips 769.21 MiB 778.59 MiB 190.65 MiB 192.47 MiB
static_quality_gate_agent_suse_arm64 762.42 MiB 772.02 MiB 173.66 MiB 174.47 MiB
static_quality_gate_agent_suse_arm64_fips 760.59 MiB 770.2 MiB 172.33 MiB 173.63 MiB
static_quality_gate_docker_agent_amd64 856.38 MiB 865.3 MiB 289.31 MiB 291.35 MiB
static_quality_gate_docker_agent_arm64 870.84 MiB 880.0 MiB 275.82 MiB 277.86 MiB
static_quality_gate_docker_agent_jmx_amd64 856.38 MiB 865.3 MiB 289.31 MiB 291.35 MiB
static_quality_gate_docker_agent_jmx_arm64 870.84 MiB 880.0 MiB 275.82 MiB 277.86 MiB
static_quality_gate_docker_agent_windows1809 856.38 MiB 865.3 MiB 289.31 MiB 291.35 MiB
static_quality_gate_docker_agent_windows1809_core 856.38 MiB 865.3 MiB 289.31 MiB 291.35 MiB
static_quality_gate_docker_agent_windows1809_core_jmx 856.38 MiB 865.3 MiB 289.31 MiB 291.35 MiB
static_quality_gate_docker_agent_windows1809_jmx 856.38 MiB 865.3 MiB 289.31 MiB 291.35 MiB
static_quality_gate_docker_agent_windows2022 856.38 MiB 865.3 MiB 289.31 MiB 291.35 MiB
static_quality_gate_docker_agent_windows2022_core 856.38 MiB 865.3 MiB 289.31 MiB 291.35 MiB
static_quality_gate_docker_agent_windows2022_core_jmx 856.38 MiB 865.3 MiB 289.31 MiB 291.35 MiB
static_quality_gate_docker_agent_windows2022_jmx 856.38 MiB 865.3 MiB 289.31 MiB 291.35 MiB
static_quality_gate_docker_cluster_agent_amd64 263.13 MiB 263.29 MiB 105.68 MiB 106.03 MiB
static_quality_gate_docker_cluster_agent_arm64 279.08 MiB 279.25 MiB 100.53 MiB 100.87 MiB
static_quality_gate_docker_cws_instrumentation_amd64 6.65 MiB 7.12 MiB 2.82 MiB 3.29 MiB
static_quality_gate_docker_cws_instrumentation_arm64 6.44 MiB 6.92 MiB 2.6 MiB 3.07 MiB
static_quality_gate_docker_dogstatsd_amd64 46.09 MiB 46.37 MiB 17.38 MiB 17.78 MiB
static_quality_gate_docker_dogstatsd_arm64 44.7 MiB 44.99 MiB 16.24 MiB 16.65 MiB
static_quality_gate_dogstatsd_deb_amd64 37.95 MiB 38.23 MiB 9.85 MiB 10.26 MiB
static_quality_gate_dogstatsd_deb_arm64 36.53 MiB 36.82 MiB 8.53 MiB 8.96 MiB
static_quality_gate_dogstatsd_rpm_amd64 37.95 MiB 38.23 MiB 9.85 MiB 10.27 MiB
static_quality_gate_dogstatsd_suse_amd64 37.95 MiB 38.23 MiB 9.85 MiB 10.27 MiB
static_quality_gate_iot_agent_deb_amd64 57.75 MiB 58.19 MiB 14.56 MiB 15.02 MiB
static_quality_gate_iot_agent_deb_arm64 55.2 MiB 55.63 MiB 12.57 MiB 13.05 MiB
static_quality_gate_iot_agent_deb_armhf 53.88 MiB 54.32 MiB 12.59 MiB 13.05 MiB
static_quality_gate_iot_agent_rpm_amd64 57.75 MiB 58.19 MiB 14.57 MiB 15.04 MiB
static_quality_gate_iot_agent_rpm_arm64 55.2 MiB 55.63 MiB 12.61 MiB 13.07 MiB
static_quality_gate_iot_agent_suse_amd64 57.75 MiB 58.19 MiB 14.57 MiB 15.04 MiB

@justin-lesko justin-lesko changed the title Justinlesko/fix docker image layer bug Resolve Docker Image Layer Digest Bug Mar 28, 2025
@justin-lesko justin-lesko added the qa/done QA done before merge and regressions are covered by tests label Mar 28, 2025
@justin-lesko justin-lesko marked this pull request as ready for review March 28, 2025 10:14
@justin-lesko justin-lesko requested a review from a team as a code owner March 28, 2025 10:14
@justin-lesko justin-lesko requested a review from a team as a code owner March 28, 2025 16:56
@justin-lesko justin-lesko added this to the 7.65.0 milestone Apr 3, 2025
@justin-lesko
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Apr 3, 2025

View all feedbacks in Devflow UI.

2025-04-03 16:51:52 UTC ℹ️ Start processing command /merge


2025-04-03 16:51:58 UTC ℹ️ MergeQueue: pull request added to the queue

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


2025-04-03 16:52:25 UTC 🚨 MergeQueue: This merge request is in error

There was an unexpected error while creating the working branch: cannot create branch DataDog/datadog-agent/merge_request:{repository:{owner:"DataDog" name:"datadog-agent"} queued_at:{seconds:1743699115 nanos:927597000} status_with_reason:STATUS_WITH_REASON_QUEUED priority:200 created_at:{seconds:1743699115 nanos:927992000} pull_request_number:35543 base_branch:"main" head_sha:"dc6f09d291cf76eec0249a0b586ff66157ea0890" id:"c76d63fa-6bdc-43f6-8a83-7590015a8bef" status:STATUS_QUEUED triggered_by:"justin.lesko@datadoghq.com" merge_status_workflow_id:"886d1473-138e-47e1-ad94-3197009d669e_41"} name:"mq-working-branch-main-b994c20" temporal_execution_workflow_id:"863a74ff-e8c5-418a-9ff9-756b0239cabe_183" temporal_execution_run_id:"5d54d243-995f-4470-89cd-93b161f34d54"

This could indicate that something doesn't work properly with the build system or that this one has reached its maximum capacity.
You can try to wait a bit and then re-add your pull request to the queue!

Details

Error: cannot create branch DataDog/datadog-agent/merge_request:{repository:{owner:"DataDog" name:"datadog-agent"} queued_at:{seconds:1743699115 nanos:927597000} status_with_reason:STATUS_WITH_REASON_QUEUED priority:200 created_at:{seconds:1743699115 nanos:927992000} pull_request_number:35543 base_branch:"main" head_sha:"dc6f09d291cf76eec0249a0b586ff66157ea0890" id:"c76d63fa-6bdc-43f6-8a83-7590015a8bef" status:STATUS_QUEUED triggered_by:"justin.lesko@datadoghq.com" merge_status_workflow_id:"886d1473-138e-47e1-ad94-3197009d669e_41"} name:"mq-working-branch-main-b994c20" temporal_execution_workflow_id:"863a74ff-e8c5-418a-9ff9-756b0239cabe_183" temporal_execution_run_id:"5d54d243-995f-4470-89cd-93b161f34d54"

FullStacktrace:
child workflow execution error (type: mergequeue_private.MergeQueue_BuildWorkingBranch, workflowID: 863a74ff-e8c5-418a-9ff9-756b0239cabe_183, runID: 5d54d243-995f-4470-89cd-93b161f34d54, initiatedEventID: 183, startedEventID: 184): cannot create branch DataDog/datadog-agent/merge_request:{repository:{owner:"DataDog" name:"datadog-agent"} queued_at:{seconds:1743699115 nanos:927597000} status_with_reason:STATUS_WITH_REASON_QUEUED priority:200 created_at:{seconds:1743699115 nanos:927992000} pull_request_number:35543 base_branch:"main" head_sha:"dc6f09d291cf76eec0249a0b586ff66157ea0890" id:"c76d63fa-6bdc-43f6-8a83-7590015a8bef" status:STATUS_QUEUED triggered_by:"justin.lesko@datadoghq.com" merge_status_workflow_id:"886d1473-138e-47e1-ad94-3197009d669e_41"} name:"mq-working-branch-main-b994c20" temporal_execution_workflow_id:"863a74ff-e8c5-418a-9ff9-756b0239cabe_183" temporal_execution_run_id:"5d54d243-995f-4470-89cd-93b161f34d54" (type: MergeQueueError, retryable: false): activity error (type: github.GithubService_CreateRefFromSha, scheduledEventID: 20, startedEventID: 21, identity: 1@github-worker-6ff656c54-gkd84@): cannot create new ref using the github API: PATCH https://api.github.com/repos/DataDog/datadog-agent/git/refs/heads/mq-working-branch-main-b994c20: 422 Reference does not exist [] (type: GitUnprocessableEntity, retryable: false): PATCH https://api.github.com/repos/DataDog/datadog-agent/git/refs/heads/mq-working-branch-main-b994c20: 422 Reference does not exist [] (type: ErrorResponse, retryable: true)

@justin-lesko justin-lesko changed the title Resolve Docker Image Layer Digest Bug [CONTINT-4635] Resolve Docker Image Layer Digest Bug Apr 3, 2025
@justin-lesko
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Apr 3, 2025

View all feedbacks in Devflow UI.

2025-04-03 16:58:11 UTC ℹ️ Start processing command /merge


2025-04-03 16:58:19 UTC ℹ️ MergeQueue: pull request added to the queue

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


2025-04-03 17:28:01 UTC 🚨 MergeQueue: This merge request is in error

mergequeue build completed successfully, but the github api returned an error while merging the pr.
GitHub returned an error during the merge attempt. This is a known issue that can often be resolved by retrying the merge request in an hour.

Details

Error: PUT https://api.github.com/repos/DataDog/datadog-agent/pulls/35543/merge: 405 Merge already in progress []

FullStacktrace:
activity error (type: github.GithubService_MergePullRequest, scheduledEventID: 41, startedEventID: 42, identity: 1@github-worker-6ff656c54-kb82v@): PUT https://api.github.com/repos/DataDog/datadog-agent/pulls/35543/merge: 405 Merge already in progress [] (type: GitFailure, retryable: false): PUT https://api.github.com/repos/DataDog/datadog-agent/pulls/35543/merge: 405 Merge already in progress [] (type: ErrorResponse, retryable: true)

@justin-lesko
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Apr 3, 2025

View all feedbacks in Devflow UI.

2025-04-03 17:59:06 UTC ℹ️ Start processing command /merge


2025-04-03 17:59:13 UTC ℹ️ MergeQueue: pull request added to the queue

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


2025-04-03 18:28:37 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit a3e7c55 into main Apr 3, 2025
246 checks passed
@dd-mergequeue dd-mergequeue bot deleted the justinlesko/fix-docker-image-layer-bug branch April 3, 2025 18:28
@github-actions github-actions bot modified the milestones: 7.65.0, 7.66.0 Apr 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
qa/done QA done before merge and regressions are covered by tests short review PR is simple enough to be reviewed quickly team/container-platform The Container Platform Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants