Skip to content

[Backport 7.66.x] Fix data race in autodiscovery kube services provider #36683

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

Merged
merged 2 commits into from
May 7, 2025

Conversation

agent-platform-auto-pr[bot]
Copy link
Contributor

Backport 80a7d1b from #36624.


Fix data race involving the upToDate field in this provider.

WARNING: DATA RACE
Write at 0x00c0012dff60 by main goroutine:
  github.com/DataDog/datadog-agent/comp/core/autodiscovery/providers.(*KubeServiceConfigProvider).Collect()
      /go/src/github.com/DataDog/datadog-agent/comp/core/autodiscovery/providers/kube_services.go:94 +0xd4
  github.com/DataDog/datadog-agent/comp/core/autodiscovery/autodiscoveryimpl.(*configPoller).collect()
      /go/src/github.com/DataDog/datadog-agent/comp/core/autodiscovery/autodiscoveryimpl/config_poller.go:213 +0x172
  github.com/DataDog/datadog-agent/comp/core/autodiscovery/autodiscoveryimpl.(*configPoller).collectOnce()
      /go/src/github.com/DataDog/datadog-agent/comp/core/autodiscovery/autodiscoveryimpl/config_poller.go:168 +0x86
  github.com/DataDog/datadog-agent/comp/core/autodiscovery/autodiscoveryimpl.(*configPoller).start()
      /go/src/github.com/DataDog/datadog-agent/comp/core/autodiscovery/autodiscoveryimpl/config_poller.go:70 +0x184
  github.com/DataDog/datadog-agent/comp/core/autodiscovery/autodiscoveryimpl.(*AutoConfig).LoadAndRun()
      /go/src/github.com/DataDog/datadog-agent/comp/core/autodiscovery/autodiscoveryimpl/autoconfig.go:468 +0xcf
  github.com/DataDog/datadog-agent/cmd/cluster-agent/subcommands/start.start()
      /go/src/github.com/DataDog/datadog-agent/cmd/cluster-agent/subcommands/start/command.go:422 +0x1e11
  runtime.call512()
      /usr/local/go/src/runtime/asm_amd64.s:780 +0x5d
  reflect.Value.Call()
      /usr/local/go/src/reflect/value.go:368 +0xb5
  github.com/DataDog/datadog-agent/pkg/util/fxutil.(*delayedFxInvocation).call()
      /go/src/github.com/DataDog/datadog-agent/pkg/util/fxutil/args.go:72 +0xcc
  github.com/DataDog/datadog-agent/pkg/util/fxutil.OneShot()
      /go/src/github.com/DataDog/datadog-agent/pkg/util/fxutil/oneshot.go:54 +0x424
  github.com/DataDog/datadog-agent/cmd/cluster-agent/subcommands/start.Commands.func1()
      /go/src/github.com/DataDog/datadog-agent/cmd/cluster-agent/subcommands/start/command.go:143 +0x25b3
  github.com/spf13/cobra.(*Command).execute()
      /go/pkg/mod/github.com/spf13/cobra@v1.9.1/command.go:1015 +0x10d3
  github.com/spf13/cobra.(*Command).ExecuteC()
      /go/pkg/mod/github.com/spf13/cobra@v1.9.1/command.go:1148 +0x655
  github.com/spf13/cobra.(*Command).Execute()
      /go/pkg/mod/github.com/spf13/cobra@v1.9.1/command.go:1071 +0x26
  main.main()
      /go/src/github.com/DataDog/datadog-agent/cmd/cluster-agent/main.go:30 +0x4ca

Previous write at 0x00c0012dff60 by goroutine 516:
  github.com/DataDog/datadog-agent/comp/core/autodiscovery/providers.(*KubeServiceConfigProvider).invalidate()
      /go/src/github.com/DataDog/datadog-agent/comp/core/autodiscovery/providers/kube_services.go:109 +0xaa
  github.com/DataDog/datadog-agent/comp/core/autodiscovery/providers.(*KubeServiceConfigProvider).invalidate-fm()
      <autogenerated>:1 +0x29
  k8s.io/client-go/tools/cache.ResourceEventHandlerFuncs.OnAdd()
      /go/pkg/mod/k8s.io/client-go@v0.31.2/tools/cache/controller.go:246 +0x63
  k8s.io/client-go/tools/cache.(*ResourceEventHandlerFuncs).OnAdd()
      <autogenerated>:1 +0x1b
  k8s.io/client-go/tools/cache.(*processorListener).run.func1()
      /go/pkg/mod/k8s.io/client-go@v0.31.2/tools/cache/shared_informer.go:978 +0x287
  k8s.io/apimachinery/pkg/util/wait.BackoffUntil.func1()
      /go/pkg/mod/k8s.io/apimachinery@v0.31.2/pkg/util/wait/backoff.go:226 +0x41
  k8s.io/apimachinery/pkg/util/wait.BackoffUntil()
      /go/pkg/mod/k8s.io/apimachinery@v0.31.2/pkg/util/wait/backoff.go:227 +0xc4
  k8s.io/apimachinery/pkg/util/wait.JitterUntil()
      /go/pkg/mod/k8s.io/apimachinery@v0.31.2/pkg/util/wait/backoff.go:204 +0x10a
  k8s.io/apimachinery/pkg/util/wait.Until()

@agent-platform-auto-pr agent-platform-auto-pr bot added qa/done QA done before merge and regressions are covered by tests backport bot labels May 6, 2025
@agent-platform-auto-pr agent-platform-auto-pr bot requested a review from a team as a code owner May 6, 2025 10:55
@agent-platform-auto-pr agent-platform-auto-pr bot added team/container-platform The Container Platform Team short review PR is simple enough to be reviewed quickly labels May 6, 2025
@agent-platform-auto-pr agent-platform-auto-pr bot requested a review from a team as a code owner May 6, 2025 10:55
@agent-platform-auto-pr
Copy link
Contributor Author

agent-platform-auto-pr bot commented May 6, 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=64355285 --os-family=ubuntu

Note: This applies to commit 8415b92

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

agent-platform-auto-pr bot commented May 6, 2025

Uncompressed package size comparison

Comparison with ancestor 57743915bc9c36d1d439c78336c47f1676814d98

Size reduction summary
package diff status size ancestor threshold
datadog-iot-agent-x86_64-rpm -0.00MB 60.89MB 60.89MB 0.50MB
datadog-iot-agent-x86_64-suse -0.00MB 60.89MB 60.89MB 0.50MB
datadog-iot-agent-aarch64-rpm -0.00MB 58.19MB 58.19MB 0.50MB
Diff per package
package diff status size ancestor threshold
datadog-agent-x86_64-rpm 0.12MB ⚠️ 805.71MB 805.59MB 0.50MB
datadog-agent-x86_64-suse 0.12MB ⚠️ 805.71MB 805.59MB 0.50MB
datadog-agent-amd64-deb 0.12MB ⚠️ 796.77MB 796.65MB 0.50MB
datadog-agent-aarch64-rpm 0.11MB ⚠️ 795.57MB 795.46MB 0.50MB
datadog-agent-arm64-deb 0.10MB ⚠️ 786.65MB 786.54MB 0.50MB
datadog-heroku-agent-amd64-deb 0.03MB ⚠️ 440.71MB 440.68MB 0.50MB
datadog-dogstatsd-amd64-deb 0.00MB 31.26MB 31.26MB 0.50MB
datadog-dogstatsd-arm64-deb 0.00MB 30.09MB 30.09MB 0.50MB
datadog-dogstatsd-x86_64-rpm 0.00MB 31.34MB 31.34MB 0.50MB
datadog-dogstatsd-x86_64-suse 0.00MB 31.34MB 31.34MB 0.50MB
datadog-iot-agent-amd64-deb 0.00MB 60.82MB 60.82MB 0.50MB
datadog-iot-agent-arm64-deb 0.00MB 58.12MB 58.12MB 0.50MB

Decision

⚠️ Warning

Copy link

cit-pr-commenter bot commented May 6, 2025

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 6fd01633-3dba-46db-bf67-955af6d8cfb7

Baseline: ea3032f
Comparison: 8415b92
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.99 [-1.77, +3.76] 1 Logs bounds checks dashboard
otlp_ingest_metrics memory utilization +0.90 [+0.75, +1.05] 1 Logs
tcp_syslog_to_blackhole ingress throughput +0.69 [+0.63, +0.75] 1 Logs
file_tree memory utilization +0.53 [+0.38, +0.68] 1 Logs
ddot_logs memory utilization +0.47 [+0.41, +0.52] 1 Logs
ddot_metrics memory utilization +0.32 [+0.27, +0.36] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization +0.19 [-0.71, +1.09] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.09 [-0.76, +0.93] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput +0.06 [-0.17, +0.28] 1 Logs
file_to_blackhole_500ms_latency egress throughput +0.04 [-0.82, +0.91] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.04 [-0.83, +0.91] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput +0.02 [-0.81, +0.84] 1 Logs
uds_dogstatsd_to_api ingress throughput +0.01 [-0.29, +0.31] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.01 [-0.86, +0.87] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput +0.00 [-0.02, +0.02] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput -0.03 [-0.86, +0.81] 1 Logs
file_to_blackhole_300ms_latency egress throughput -0.05 [-0.89, +0.80] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.12 [-0.16, -0.08] 1 Logs
quality_gate_idle_all_features memory utilization -0.14 [-0.23, -0.05] 1 Logs bounds checks dashboard
quality_gate_idle memory utilization -0.30 [-0.37, -0.23] 1 Logs bounds checks dashboard
otlp_ingest_logs memory utilization -0.32 [-0.48, -0.16] 1 Logs

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 bounds checks dashboard
quality_gate_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_logs memory_usage 10/10 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_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 lost_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.
  • 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 Author

agent-platform-auto-pr bot commented May 6, 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 770.55 MiB 778.06 MiB 188.75 MiB 191.06 MiB
static_quality_gate_agent_deb_amd64_fips 768.45 MiB 776.09 MiB 187.23 MiB 190.72 MiB
static_quality_gate_agent_heroku_amd64 428.36 MiB 434.99 MiB 112.75 MiB 114.34 MiB
static_quality_gate_agent_msi 958.57 MiB 978.45 MiB 148.12 MiB 151.65 MiB
static_quality_gate_agent_rpm_amd64 770.46 MiB 778.06 MiB 189.47 MiB 193.42 MiB
static_quality_gate_agent_rpm_amd64_fips 768.39 MiB 776.06 MiB 189.02 MiB 192.61 MiB
static_quality_gate_agent_rpm_arm64 760.8 MiB 768.33 MiB 172.24 MiB 174.71 MiB
static_quality_gate_agent_rpm_arm64_fips 758.93 MiB 766.55 MiB 171.13 MiB 173.92 MiB
static_quality_gate_agent_suse_amd64 770.62 MiB 778.08 MiB 189.47 MiB 193.42 MiB
static_quality_gate_agent_suse_amd64_fips 768.37 MiB 776.11 MiB 189.02 MiB 192.78 MiB
static_quality_gate_agent_suse_arm64 760.92 MiB 768.31 MiB 172.24 MiB 174.71 MiB
static_quality_gate_agent_suse_arm64_fips 758.9 MiB 766.5 MiB 171.13 MiB 173.92 MiB
static_quality_gate_docker_agent_amd64 855.17 MiB 862.5 MiB 287.85 MiB 292.0 MiB
static_quality_gate_docker_agent_arm64 868.78 MiB 876.0 MiB 274.46 MiB 278.3 MiB
static_quality_gate_docker_agent_jmx_amd64 855.17 MiB 862.5 MiB 287.85 MiB 292.0 MiB
static_quality_gate_docker_agent_jmx_arm64 868.78 MiB 876.63 MiB 274.46 MiB 278.4 MiB
static_quality_gate_docker_agent_windows1809 855.17 MiB 862.5 MiB 287.85 MiB 292.0 MiB
static_quality_gate_docker_agent_windows1809_core 855.17 MiB 862.5 MiB 287.85 MiB 292.0 MiB
static_quality_gate_docker_agent_windows1809_core_jmx 855.17 MiB 862.5 MiB 287.85 MiB 292.0 MiB
static_quality_gate_docker_agent_windows1809_jmx 855.17 MiB 862.5 MiB 287.85 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022 855.17 MiB 862.5 MiB 287.85 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022_core 855.17 MiB 862.5 MiB 287.85 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022_core_jmx 855.17 MiB 862.5 MiB 287.85 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022_jmx 855.17 MiB 862.5 MiB 287.85 MiB 292.0 MiB
static_quality_gate_docker_cluster_agent_amd64 262.74 MiB 263.4 MiB 103.32 MiB 104.07 MiB
static_quality_gate_docker_cluster_agent_arm64 278.68 MiB 279.38 MiB 98.19 MiB 98.95 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 38.03 MiB 46.39 MiB 14.67 MiB 17.78 MiB
static_quality_gate_docker_dogstatsd_arm64 36.94 MiB 45.05 MiB 13.75 MiB 16.65 MiB
static_quality_gate_dogstatsd_deb_amd64 29.89 MiB 38.4 MiB 7.91 MiB 10.26 MiB
static_quality_gate_dogstatsd_deb_arm64 28.77 MiB 36.98 MiB 6.89 MiB 8.96 MiB
static_quality_gate_dogstatsd_rpm_amd64 29.89 MiB 38.4 MiB 7.92 MiB 10.27 MiB
static_quality_gate_dogstatsd_suse_amd64 29.89 MiB 38.4 MiB 7.92 MiB 10.27 MiB
static_quality_gate_iot_agent_deb_amd64 58.08 MiB 58.51 MiB 14.6 MiB 15.02 MiB
static_quality_gate_iot_agent_deb_arm64 55.51 MiB 55.94 MiB 12.63 MiB 13.05 MiB
static_quality_gate_iot_agent_deb_armhf 54.21 MiB 54.32 MiB 12.62 MiB 13.05 MiB
static_quality_gate_iot_agent_rpm_amd64 58.08 MiB 58.51 MiB 14.63 MiB 15.04 MiB
static_quality_gate_iot_agent_rpm_arm64 55.5 MiB 55.94 MiB 12.65 MiB 13.07 MiB
static_quality_gate_iot_agent_suse_amd64 58.08 MiB 58.51 MiB 14.63 MiB 15.04 MiB

Copy link
Contributor

@maycmlee maycmlee left a comment

Choose a reason for hiding this comment

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

Small suggestions, but approving to not block merge.

@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 May 7, 2025
@kacper-murzyn
Copy link
Contributor

/merge

@dd-devflow
Copy link

dd-devflow bot commented May 7, 2025

View all feedbacks in Devflow UI.

2025-05-07 09:48:14 UTC ℹ️ Start processing command /merge


2025-05-07 09:48:18 UTC ℹ️ MergeQueue: pull request added to the queue

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


2025-05-07 10:17:05 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit f6d4378 into 7.66.x May 7, 2025
243 checks passed
@dd-mergequeue dd-mergequeue bot deleted the backport-36624-to-7.66.x branch May 7, 2025 10:17
@github-actions github-actions bot added this to the 7.66.0 milestone May 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport bot medium review PR review might take time qa/done QA done before merge and regressions are covered by tests team/container-platform The Container Platform Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants