Skip to content

SVLS-8771 fix cloud run jobs shutdown race#47827

Open
apiarian-datadog wants to merge 4 commits intomainfrom
aleksandr.pasechnik/svls-8771-fix-cloud-run-jobs-shutdown-race
Open

SVLS-8771 fix cloud run jobs shutdown race#47827
apiarian-datadog wants to merge 4 commits intomainfrom
aleksandr.pasechnik/svls-8771-fix-cloud-run-jobs-shutdown-race

Conversation

@apiarian-datadog
Copy link
Contributor

What does this PR do?

Drain samples on aggregator flush. This way samples that are submitted right at shutdown correctly get flushed.

Motivation

We noticed some metrics being missed in cloud run jobs at shutdown. The metrics get submitted correctly if we enable debug logging, adding time for the aggregator to fully drain.

Describe how you validated your changes

Unit test. Running the test without the fix in CI to confirm that it actually detects the problem. Also deployed to a real cloud run job which shows the issue without the fix and correctly submits metrics with the fix in place.

Need to make sure that the test actually fails in our ci. Then we can
re-enable the fix.
@dd-octo-sts dd-octo-sts bot added the internal Identify a non-fork PR label Mar 13, 2026
@github-actions github-actions bot added the short review PR is simple enough to be reviewed quickly label Mar 13, 2026
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Mar 13, 2026

Files inventory check summary

File checks results against ancestor f833cb1c:

Results for datadog-agent_7.78.0~devel.git.592.d922361.pipeline.102473987-1_amd64.deb:

No change detected

@cit-pr-commenter-54b7da
Copy link

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

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: b9cb1ac2-8478-4ba7-96cc-a3afe222e7ce

Baseline: b9ff244
Comparison: d922361
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 +0.11 [-2.91, +3.14] 1 Logs

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_logs % cpu utilization +2.71 [+1.11, +4.30] 1 Logs bounds checks dashboard
docker_containers_memory memory utilization +1.65 [+1.49, +1.81] 1 Logs
otlp_ingest_metrics memory utilization +0.78 [+0.63, +0.94] 1 Logs
tcp_syslog_to_blackhole ingress throughput +0.55 [+0.41, +0.69] 1 Logs
ddot_metrics_sum_cumulative memory utilization +0.47 [+0.33, +0.61] 1 Logs
ddot_logs memory utilization +0.46 [+0.40, +0.53] 1 Logs
quality_gate_idle_all_features memory utilization +0.14 [+0.10, +0.18] 1 Logs bounds checks dashboard
file_to_blackhole_500ms_latency egress throughput +0.12 [-0.27, +0.51] 1 Logs
docker_containers_cpu % cpu utilization +0.11 [-2.91, +3.14] 1 Logs
quality_gate_idle memory utilization +0.10 [+0.05, +0.15] 1 Logs bounds checks dashboard
file_to_blackhole_0ms_latency egress throughput +0.08 [-0.45, +0.61] 1 Logs
file_tree memory utilization +0.08 [+0.02, +0.13] 1 Logs
quality_gate_metrics_logs memory utilization +0.02 [-0.22, +0.26] 1 Logs bounds checks dashboard
tcp_dd_logs_filter_exclude ingress throughput +0.01 [-0.10, +0.12] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.00 [-0.09, +0.09] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.00 [-0.20, +0.19] 1 Logs
uds_dogstatsd_to_api_v3 ingress throughput -0.01 [-0.20, +0.18] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.02 [-0.44, +0.41] 1 Logs
ddot_metrics_sum_delta memory utilization -0.06 [-0.22, +0.10] 1 Logs
otlp_ingest_logs memory utilization -0.11 [-0.20, -0.01] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.29 [-0.36, -0.23] 1 Logs
ddot_metrics_sum_cumulativetodelta_exporter memory utilization -0.33 [-0.56, -0.11] 1 Logs
ddot_metrics memory utilization -0.49 [-0.65, -0.33] 1 Logs

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed observed_value links
docker_containers_cpu simple_check_run 10/10 696 ≥ 26
docker_containers_memory memory_usage 10/10 272.24MiB ≤ 370MiB
docker_containers_memory simple_check_run 10/10 679 ≥ 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.19GiB ≤ 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 173.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 490.29MiB ≤ 550MiB bounds checks dashboard
quality_gate_logs intake_connections 10/10 3 ≤ 6 bounds checks dashboard
quality_gate_logs memory_usage 10/10 205.03MiB ≤ 220MiB bounds checks dashboard
quality_gate_logs missed_bytes 10/10 0B = 0B bounds checks dashboard
quality_gate_metrics_logs cpu_usage 10/10 351.29 ≤ 2000 bounds checks dashboard
quality_gate_metrics_logs intake_connections 10/10 4 ≤ 6 bounds checks dashboard
quality_gate_metrics_logs memory_usage 10/10 402.55MiB ≤ 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 intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, 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 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 memory_usage: 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_logs, bounds check missed_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 intake_connections: 10/10 replicas passed. Gate passed.

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Mar 13, 2026

Static quality checks

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

Successful checks

Info

Quality gate Change Size (prev → curr → max)
agent_rpm_arm64_fips +4.0 KiB (0.00% increase) 686.154 → 686.158 → 694.440
agent_suse_arm64_fips +4.0 KiB (0.00% increase) 686.154 → 686.158 → 694.440
docker_cluster_agent_amd64 +4.01 KiB (0.00% increase) 203.662 → 203.666 → 206.270
docker_dogstatsd_amd64 +4.0 KiB (0.01% increase) 38.619 → 38.623 → 39.380
iot_agent_deb_armhf +4.0 KiB (0.01% increase) 40.843 → 40.847 → 41.030
25 successful checks with minimal change (< 2 KiB)
Quality gate Current Size
agent_deb_amd64 746.938 MiB
agent_deb_amd64_fips 705.304 MiB
agent_heroku_amd64 311.743 MiB
agent_rpm_amd64 746.922 MiB
agent_rpm_amd64_fips 705.288 MiB
agent_rpm_arm64 724.842 MiB
agent_suse_amd64 746.922 MiB
agent_suse_amd64_fips 705.288 MiB
agent_suse_arm64 724.842 MiB
docker_agent_amd64 807.275 MiB
docker_agent_arm64 809.996 MiB
docker_agent_jmx_amd64 998.190 MiB
docker_agent_jmx_arm64 989.690 MiB
docker_cluster_agent_arm64 218.164 MiB
docker_cws_instrumentation_amd64 7.142 MiB
docker_cws_instrumentation_arm64 6.689 MiB
docker_dogstatsd_arm64 36.939 MiB
dogstatsd_deb_amd64 29.847 MiB
dogstatsd_deb_arm64 28.000 MiB
dogstatsd_rpm_amd64 29.847 MiB
dogstatsd_suse_amd64 29.847 MiB
iot_agent_deb_amd64 43.048 MiB
iot_agent_deb_arm64 40.111 MiB
iot_agent_rpm_amd64 43.049 MiB
iot_agent_suse_amd64 43.049 MiB
On-wire sizes (compressed)
Quality gate Change Size (prev → curr → max)
agent_deb_amd64 -6.93 KiB (0.00% reduction) 174.449 → 174.442 → 177.700
agent_deb_amd64_fips +20.59 KiB (0.01% increase) 165.336 → 165.356 → 172.230
agent_heroku_amd64 neutral 75.174 MiB → 79.970
agent_rpm_amd64 +24.81 KiB (0.01% increase) 176.425 → 176.449 → 180.780
agent_rpm_amd64_fips -45.18 KiB (0.03% reduction) 168.093 → 168.049 → 173.370
agent_rpm_arm64 +2.71 KiB (0.00% increase) 159.333 → 159.336 → 161.610
agent_rpm_arm64_fips neutral 151.361 MiB → 155.910
agent_suse_amd64 +24.81 KiB (0.01% increase) 176.425 → 176.449 → 180.780
agent_suse_amd64_fips -45.18 KiB (0.03% reduction) 168.093 → 168.049 → 173.370
agent_suse_arm64 +2.71 KiB (0.00% increase) 159.333 → 159.336 → 161.610
agent_suse_arm64_fips neutral 151.361 MiB → 155.910
docker_agent_amd64 +3.7 KiB (0.00% increase) 267.109 → 267.112 → 271.240
docker_agent_arm64 +4.04 KiB (0.00% increase) 254.420 → 254.424 → 259.800
docker_agent_jmx_amd64 neutral 335.765 MiB → 339.870
docker_agent_jmx_arm64 +7.17 KiB (0.00% increase) 319.056 → 319.063 → 324.390
docker_cluster_agent_amd64 neutral 71.275 MiB → 72.920
docker_cluster_agent_arm64 -10.02 KiB (0.01% reduction) 66.918 → 66.908 → 68.220
docker_cws_instrumentation_amd64 neutral 2.999 MiB → 3.330
docker_cws_instrumentation_arm64 neutral 2.729 MiB → 3.090
docker_dogstatsd_amd64 neutral 14.944 MiB → 15.820
docker_dogstatsd_arm64 +16.41 KiB (0.11% increase) 14.274 → 14.290 → 14.830
dogstatsd_deb_amd64 neutral 7.884 MiB → 8.790
dogstatsd_deb_arm64 neutral 6.769 MiB → 7.710
dogstatsd_rpm_amd64 neutral 7.896 MiB → 8.800
dogstatsd_suse_amd64 neutral 7.896 MiB → 8.800
iot_agent_deb_amd64 -2.83 KiB (0.02% reduction) 11.349 → 11.346 → 12.040
iot_agent_deb_arm64 neutral 9.661 MiB → 10.450
iot_agent_deb_armhf neutral 9.890 MiB → 10.620
iot_agent_rpm_amd64 -3.5 KiB (0.03% reduction) 11.368 → 11.364 → 12.060
iot_agent_suse_amd64 -3.5 KiB (0.03% reduction) 11.368 → 11.364 → 12.060

@apiarian-datadog apiarian-datadog added the qa/done QA done before merge and regressions are covered by tests label Mar 13, 2026
@apiarian-datadog apiarian-datadog marked this pull request as ready for review March 13, 2026 20:27
@apiarian-datadog apiarian-datadog requested a review from a team as a code owner March 13, 2026 20:27
Copy link

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

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: 82285ffcfa

ℹ️ 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 on lines +142 to +144
case ms := <-w.samplesChan:
w.processSamples(ms)
default:

Choose a reason for hiding this comment

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

P1 Badge Bound sample draining before flush to avoid flush starvation

The new flush path drains samplesChan until it is empty, but in the agent demultiplexer AggregateSamples can keep feeding that channel concurrently while the flush loop waits synchronously for t.blockChan. Under sustained DogStatsD traffic, this loop may never observe the channel empty, so triggerFlush is never reached; that blocks periodic/manual flushes and can also stall shutdown progress because stopChan is not checked inside drainSamples.

Useful? React with 👍 / 👎.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@codex address that feedback

Choose a reason for hiding this comment

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

Summary

  • Addressed the review feedback on pkg/aggregator/time_sampler_worker.go by updating drainSamples() to consume exactly the snapshotted buffered count (n := len(samplesChan)) without a default branch, preventing premature exit while keeping drain bounded and non-starvable by concurrent producers. pkg/aggregator/time_sampler_worker.goL137-L150
  • Added an in-code rationale clarifying why receiving exactly n items cannot block in this worker model (single consumer on samplesChan). pkg/aggregator/time_sampler_worker.goL144-L148
  • Committed the change on branch work as commit 1e3946eb, and created the follow-up PR record via make_pr with a summary and validation steps.

Testing

  • ⚠️ python - <<'PY' ... urllib.request.urlopen('https://go.dev/ref/spec#Channel_types') ... PY (failed due to network proxy/tunnel restriction: 403 Forbidden).
  • go test ./pkg/aggregator -tags test -run TestFlushIncludesPendingSamples -count=1
  • go test ./pkg/aggregator -tags test -run TestFlushIncludesPendingSamples -count=10

View task →

Copy link
Contributor Author

Choose a reason for hiding this comment

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

that solution seems a little too clever. if the channel is drained by something else we could end up getting locked, right? this proposed alternative change is okay now, but may be a surprising error in the future.

@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 13, 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/done QA done before merge and regressions are covered by tests team/agent-metric-pipelines team/serverless-azure-gcp

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant