Revert "[SBOM] Fix inUse false positives on container image SBOM"#48699
Revert "[SBOM] Fix inUse false positives on container image SBOM"#48699
Conversation
)" This reverts commit 2c1ce77.
songy23
added
changelog/no-changelog
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: c7d8d46f7f
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| // Process all image events first | ||
| for _, event := range imageEvents { |
There was a problem hiding this comment.
Handling all image events before container events means processImageSBOM reads imageUsers before same-bundle EventTypeUnset container removals are applied, so the emitted SBOM can report InUse=true for an image whose last running container was removed in that bundle. This is a data-accuracy regression whenever workloadmeta coalesces image refresh and container teardown together.
Useful? React with 👍 / 👎.
| if !ctr.State.Running { | ||
| // Container is no longer running. Remove it from imageUsers so that a | ||
| // subsequent SBOM computation does not incorrectly set inUse=true for | ||
| // an image that has no running containers. | ||
| p.unregisterContainer(ctr) | ||
| return | ||
| } |
There was a problem hiding this comment.
Returning immediately when ctr.State.Running is false leaves any prior imageUsers[imgID][ctrID] entry intact, so a container that transitions from running to stopped via a Set event keeps the image marked as in use until/unless an Unset arrives. That causes stale InUse=true values on subsequent image SBOM emissions for runtimes/reporting paths that send stopped updates before removal.
Useful? React with 👍 / 👎.
| if !inUse { | ||
| _, inUse = p.imageUsers[img.ID] |
There was a problem hiding this comment.
The img.ID lookup now runs only inside the len(repoDigests)==0 branch, so images that do have repo digests but whose containers are keyed in imageUsers by raw image ID (common with containerd-style ctr.Image.ID) are misclassified as not in use. This emits false InUse=false for actively running containers.
Useful? React with 👍 / 👎.
Files inventory check summaryFile checks results against ancestor b0cdd1c2: Results for datadog-agent_7.79.0~devel.git.320.c7d8d46.pipeline.105340415-1_amd64.deb:No change detected |
Static quality checks✅ Please find below the results from static quality gates Successful checksInfo
28 successful checks with minimal change (< 2 KiB)
On-wire sizes (compressed)
|
Regression DetectorRegression Detector ResultsMetrics dashboard Baseline: b0cdd1c Optimization Goals: ✅ No significant changes detected
|
| perf | experiment | goal | Δ mean % | Δ mean % CI | trials | links |
|---|---|---|---|---|---|---|
| ➖ | docker_containers_cpu | % cpu utilization | -0.78 | [-3.71, +2.16] | 1 | Logs |
Fine details of change detection per experiment
| perf | experiment | goal | Δ mean % | Δ mean % CI | trials | links |
|---|---|---|---|---|---|---|
| ➖ | tcp_syslog_to_blackhole | ingress throughput | +1.74 | [+1.60, +1.87] | 1 | Logs |
| ➖ | docker_containers_memory | memory utilization | +0.95 | [+0.87, +1.03] | 1 | Logs |
| ➖ | quality_gate_metrics_logs | memory utilization | +0.31 | [+0.06, +0.55] | 1 | Logs bounds checks dashboard |
| ➖ | file_to_blackhole_0ms_latency | egress throughput | +0.07 | [-0.44, +0.59] | 1 | Logs |
| ➖ | ddot_metrics | memory utilization | +0.07 | [-0.11, +0.25] | 1 | Logs |
| ➖ | ddot_metrics_sum_cumulativetodelta_exporter | memory utilization | +0.04 | [-0.18, +0.26] | 1 | Logs |
| ➖ | file_to_blackhole_1000ms_latency | egress throughput | +0.03 | [-0.42, +0.47] | 1 | Logs |
| ➖ | quality_gate_idle_all_features | memory utilization | +0.01 | [-0.02, +0.05] | 1 | Logs bounds checks dashboard |
| ➖ | file_to_blackhole_100ms_latency | egress throughput | +0.00 | [-0.08, +0.09] | 1 | Logs |
| ➖ | tcp_dd_logs_filter_exclude | ingress throughput | -0.00 | [-0.11, +0.10] | 1 | Logs |
| ➖ | uds_dogstatsd_to_api_v3 | ingress throughput | -0.01 | [-0.21, +0.19] | 1 | Logs |
| ➖ | file_to_blackhole_500ms_latency | egress throughput | -0.01 | [-0.40, +0.38] | 1 | Logs |
| ➖ | uds_dogstatsd_to_api | ingress throughput | -0.01 | [-0.21, +0.19] | 1 | Logs |
| ➖ | ddot_metrics_sum_delta | memory utilization | -0.01 | [-0.18, +0.15] | 1 | Logs |
| ➖ | file_tree | memory utilization | -0.10 | [-0.16, -0.05] | 1 | Logs |
| ➖ | otlp_ingest_metrics | memory utilization | -0.12 | [-0.29, +0.04] | 1 | Logs |
| ➖ | ddot_logs | memory utilization | -0.15 | [-0.22, -0.09] | 1 | Logs |
| ➖ | quality_gate_idle | memory utilization | -0.18 | [-0.23, -0.13] | 1 | Logs bounds checks dashboard |
| ➖ | otlp_ingest_logs | memory utilization | -0.45 | [-0.56, -0.34] | 1 | Logs |
| ➖ | uds_dogstatsd_20mb_12k_contexts_20_senders | memory utilization | -0.46 | [-0.52, -0.41] | 1 | Logs |
| ➖ | ddot_metrics_sum_cumulative | memory utilization | -0.64 | [-0.78, -0.51] | 1 | Logs |
| ➖ | docker_containers_cpu | % cpu utilization | -0.78 | [-3.71, +2.16] | 1 | Logs |
| ➖ | quality_gate_logs | % cpu utilization | -0.94 | [-2.53, +0.65] | 1 | Logs bounds checks dashboard |
Bounds Checks: ❌ Failed
| perf | experiment | bounds_check_name | replicates_passed | observed_value | links |
|---|---|---|---|---|---|
| ✅ | docker_containers_cpu | simple_check_run | 10/10 | 667 ≥ 26 | |
| ✅ | docker_containers_memory | memory_usage | 10/10 | 273.57MiB ≤ 370MiB | |
| ✅ | docker_containers_memory | simple_check_run | 10/10 | 692 ≥ 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 | 9/10 | 175.92MiB > 175MiB | bounds checks dashboard |
| ✅ | quality_gate_idle_all_features | intake_connections | 10/10 | 3 = 3 | bounds checks dashboard |
| ✅ | quality_gate_idle_all_features | memory_usage | 10/10 | 491.77MiB ≤ 550MiB | bounds checks dashboard |
| ✅ | quality_gate_logs | intake_connections | 10/10 | 4 ≤ 6 | bounds checks dashboard |
| ✅ | quality_gate_logs | memory_usage | 10/10 | 204.96MiB ≤ 220MiB | bounds checks dashboard |
| ✅ | quality_gate_logs | missed_bytes | 10/10 | 0B = 0B | bounds checks dashboard |
| ✅ | quality_gate_metrics_logs | cpu_usage | 10/10 | 366.84 ≤ 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 | 406.90MiB ≤ 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:
-
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
❌ Failed. Some Quality Gates were violated.
- quality_gate_metrics_logs, bounds check missed_bytes: 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 intake_connections: 10/10 replicas passed. Gate passed.
- quality_gate_metrics_logs, bounds check cpu_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_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
- quality_gate_logs, bounds check missed_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 intake_connections: 10/10 replicas passed. Gate passed.
- quality_gate_idle, bounds check memory_usage: 9/10 replicas passed. Failed 1 which is > 0. Gate FAILED.
|
Should be fixed in #48725 |
|
Thanks @0intro ! |
2 participants
Reverts #48586
Breaks CIs, e.g. http://gitlab.ddbuild.io/DataDog/datadog-agent/-/jobs/1555807779