Skip to content

fix(network/tracer): fix data race on conntrackerTelemetry.lastRegisters - #54914

Draft
pgimalac wants to merge 1 commit into
mainfrom
pgimalac/fix-conntracker-telemetry-race
Draft

fix(network/tracer): fix data race on conntrackerTelemetry.lastRegisters#54914
pgimalac wants to merge 1 commit into
mainfrom
pgimalac/fix-conntracker-telemetry-race

Conversation

@pgimalac

@pgimalac pgimalac commented Aug 14, 2026

Copy link
Copy Markdown
Member

What does this PR do?

Fixes a data race on conntrackerTelemetry.lastRegisters: Collect() did a non-atomic read-modify-write on the field, racing when two Prometheus Gather ticks overlapped. Moves lastRegisters to the ebpfConntracker instance and uses a CAS loop (CompareAndSwap) so the read-modify-write is atomic and the stored counter only moves forward. Making the baseline per-instance also fixes a regression on module restart: a new conntracker gets a fresh telemetry map, so a package-level baseline (which retained the old map's counter) would have suppressed all deltas until the new counter exceeded the old total.

Motivation

Fix a race, found via a race-detector-enabled build in staging (see #54333 for context).

Describe how you validated your changes

The race is eliminated by construction — computeRegistersDelta uses CompareAndSwap in a loop, making the read-modify-write atomic and ensuring lastRegisters is monotonic. The baseline is per-conntracker-instance, so a module restart naturally resets it. Note: the package requires the linux_bpf build tag and could not be run in this environment, but compiles correctly.

@github-actions

Copy link
Copy Markdown
Contributor

@codex review

@github-actions github-actions Bot added the short review PR is simple enough to be reviewed quickly label Aug 14, 2026

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cae0b5c5fd

ℹ️ 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".

Comment thread pkg/network/tracer/ebpf_conntracker.go Outdated
@pgimalac
pgimalac force-pushed the pgimalac/fix-conntracker-telemetry-race branch 2 times, most recently from 70391b4 to 31d3695 Compare August 14, 2026 16:57
@pgimalac pgimalac added qa/done QA done before merge and regressions are covered by tests changelog/no-changelog No changelog entry needed labels Aug 14, 2026
@pgimalac

Copy link
Copy Markdown
Member Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 31d369597e

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread pkg/network/tracer/ebpf_conntracker.go
@datadog-prod-us1-4

datadog-prod-us1-4 Bot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

🎯 Code Coverage (details)
Patch Coverage: 100.00%
Overall Coverage: 52.40% (+0.04%)

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 559da95 | Docs | Datadog PR Page | Give us feedback!

Collect() did a non-atomic read-modify-write on the package-level
conntrackerTelemetry.lastRegisters field. When two Prometheus Gather
ticks overlapped, both goroutines raced on this field.

Move lastRegisters to the ebpfConntracker instance and use a CAS loop
(CompareAndSwap) so the read-modify-write is atomic and the stored
counter only moves forward. Making the baseline per-instance also fixes
a regression on module restart: a new conntracker gets a fresh
telemetry map, so the package-level baseline (which retained the old
map's counter) would have suppressed all deltas until the new counter
exceeded the old total.

Found via a race-detector-enabled build in staging (see #54333).
@pgimalac
pgimalac force-pushed the pgimalac/fix-conntracker-telemetry-race branch from 31d3695 to 559da95 Compare August 14, 2026 17:19
@dd-octo-sts

dd-octo-sts Bot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

Files inventory check summary

File checks results against ancestor 768df0b4:

Results for datadog-agent_7.84.0~devel.git.206.559da95.pipeline.131060776-1_amd64.deb:

No change detected

Results for datadog-iot-agent_7.84.0~devel.git.206.559da95.pipeline.131060776-1_amd64.deb:

No change detected

@dd-octo-sts

dd-octo-sts Bot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor 768df0b
📊 Static Quality Gates Dashboard
🔗 SQG Job

32 successful checks with minimal change (< 2 KiB)
Quality gate Current Size
agent_deb_amd64 759.617 MiB
agent_deb_amd64_fips 712.473 MiB
agent_heroku_amd64 311.955 MiB
agent_rpm_amd64 759.600 MiB
agent_rpm_amd64_fips 712.457 MiB
agent_rpm_arm64 735.360 MiB
agent_rpm_arm64_fips 691.546 MiB
agent_suse_amd64 759.600 MiB
agent_suse_amd64_fips 712.457 MiB
agent_suse_arm64 735.360 MiB
agent_suse_arm64_fips 691.546 MiB
docker_agent_amd64 818.232 MiB
docker_agent_arm64 819.035 MiB
docker_agent_jmx_amd64 1009.130 MiB
docker_agent_jmx_arm64 998.585 MiB
docker_cluster_agent_amd64 210.475 MiB
docker_cluster_agent_arm64 223.456 MiB
docker_cws_instrumentation_amd64 7.439 MiB
docker_cws_instrumentation_arm64 6.877 MiB
docker_dogstatsd_amd64 39.482 MiB
docker_dogstatsd_arm64 37.560 MiB
docker_host_profiler_amd64 305.814 MiB
docker_host_profiler_arm64 317.125 MiB
dogstatsd_deb_amd64 30.224 MiB
dogstatsd_deb_arm64 28.247 MiB
dogstatsd_rpm_amd64 30.224 MiB
dogstatsd_suse_amd64 30.224 MiB
iot_agent_deb_amd64 46.467 MiB
iot_agent_deb_arm64 43.124 MiB
iot_agent_deb_armhf 43.907 MiB
iot_agent_rpm_amd64 46.468 MiB
iot_agent_suse_amd64 46.467 MiB

@cit-pr-commenter-54b7da

Copy link
Copy Markdown

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Job ID: 9665e99a-d847-432d-ad3d-a5a6fedfbb64

Baseline: 768df0b
Comparison: 559da95
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_logs % cpu utilization +0.26 [-0.62, +1.13] 1 Logs bounds checks dashboard
quality_gate_security_mean_fs_load memory utilization +0.26 [+0.19, +0.32] 1 Logs bounds checks dashboard
quality_gate_idle memory utilization +0.16 [+0.04, +0.28] 1 Logs bounds checks dashboard
quality_gate_security_idle memory utilization -0.06 [-0.16, +0.04] 1 Logs bounds checks dashboard
quality_gate_metrics_logs memory utilization -0.22 [-0.47, +0.02] 1 Logs bounds checks dashboard
quality_gate_private_action_runner memory utilization -0.28 [-0.40, -0.15] 1 Logs bounds checks dashboard
quality_gate_idle_all_features memory utilization -0.29 [-0.33, -0.25] 1 Logs bounds checks dashboard
quality_gate_security_no_fs_load memory utilization -0.38 [-0.53, -0.23] 1 Logs bounds checks dashboard

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed observed_value links
quality_gate_idle intake_connections 10/10 4 = 4 bounds checks dashboard
quality_gate_idle memory_usage 10/10 171.97MiB ≤ 178MiB bounds checks dashboard
quality_gate_idle total_bytes_received 10/10 742.50KiB ≤ 819.20KiB bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 4 = 4 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 513.18MiB ≤ 538MiB bounds checks dashboard
quality_gate_idle_all_features total_bytes_received 10/10 1.13MiB ≤ 1.25MiB bounds checks dashboard
quality_gate_logs intake_connections 10/10 17 ≤ 40 bounds checks dashboard
quality_gate_logs memory_usage 10/10 202.42MiB ≤ 229MiB bounds checks dashboard
quality_gate_logs missed_bytes 10/10 0B = 0B bounds checks dashboard
quality_gate_logs total_bytes_received 10/10 264.16MiB ≤ 292MiB bounds checks dashboard
quality_gate_metrics_logs cpu_usage 10/10 416.32 ≤ 2000 bounds checks dashboard
quality_gate_metrics_logs intake_connections 10/10 18 ≤ 40 bounds checks dashboard
quality_gate_metrics_logs memory_usage 10/10 403.36MiB ≤ 439MiB bounds checks dashboard
quality_gate_metrics_logs missed_bytes 10/10 0B = 0B bounds checks dashboard
quality_gate_metrics_logs total_bytes_received 10/10 0.94GiB ≤ 1.04GiB bounds checks dashboard
quality_gate_private_action_runner memory_usage 10/10 71.82MiB ≤ 76MiB bounds checks dashboard
quality_gate_security_idle cpu_usage 10/10 27.51 ≤ 100 bounds checks dashboard
quality_gate_security_idle memory_usage 10/10 322.14MiB ≤ 335MiB bounds checks dashboard
quality_gate_security_mean_fs_load cpu_usage 10/10 62.87 ≤ 200 bounds checks dashboard
quality_gate_security_mean_fs_load memory_usage 10/10 303.84MiB ≤ 314MiB bounds checks dashboard
quality_gate_security_no_fs_load cpu_usage 10/10 21.09 ≤ 100 bounds checks dashboard
quality_gate_security_no_fs_load memory_usage 10/10 309.65MiB ≤ 343MiB 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_metrics_logs, bounds check missed_bytes: 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 intake_connections: 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 total_bytes_received: 10/10 replicas passed. Gate passed.
  • quality_gate_security_mean_fs_load, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_mean_fs_load, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_idle, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check total_bytes_received: 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.
  • quality_gate_private_action_runner, 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_all_features, bounds check total_bytes_received: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check total_bytes_received: 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.
  • quality_gate_security_no_fs_load, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_no_fs_load, bounds check cpu_usage: 10/10 replicas passed. Gate passed.

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 component/system-probe internal Identify a non-fork PR qa/done QA done before merge and regressions are covered by tests short review PR is simple enough to be reviewed quickly team/cloud-network-monitoring

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant