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

[netpath] Fix panic in npCollector cause by forwader.SendEventPlatformEventBlocking() call #35095

Merged
merged 9 commits into from
Mar 14, 2025

Conversation

AlexandreYang
Copy link
Member

@AlexandreYang AlexandreYang commented Mar 13, 2025

What does this PR do?

[netpath] Fix panic in npCollector cause by forwader.SendEventPlatformEventBlocking() call

Problem: we are not waiting for workers to shutdown during NpCollector Stop sequence.

Motivation

Fix following panic:

2025-03-13 13:39:35 UTC | PROCESS | INFO | (comp/rdnsquerier/impl/querier.go:70 in stop) | Reverse DNS Enrichment stopped workers
panic: send on closed channel
goroutine 457 [running]:
github.com/DataDog/datadog-agent/comp/forwarder/eventplatform/eventplatformimpl.(*defaultEventPlatformForwarder).SendEventPlatformEventBlocking(0xc000ab2c80?, 0xc001efa410, {0x208d5cf, 0xc})
	/omnibus/src/datadog-agent/src/github.com/DataDog/datadog-agent/comp/forwarder/eventplatform/eventplatformimpl/epforwarder.go:302 +0x7a
github.com/DataDog/datadog-agent/comp/networkpath/npcollector/npcollectorimpl.(*npCollectorImpl).runTracerouteForPath(0xc000c651e0, 0xc00164e5a0)
	/omnibus/src/datadog-agent/src/github.com/DataDog/datadog-agent/comp/networkpath/npcollector/npcollectorimpl/npcollector.go:282 +0x544
github.com/DataDog/datadog-agent/comp/networkpath/npcollector/npcollectorimpl.(*npCollectorImpl).startWorker(0xc000c651e0, 0x3)
	/omnibus/src/datadog-agent/src/github.com/DataDog/datadog-agent/comp/networkpath/npcollector/npcollectorimpl/npcollector.go:459 +0x97
created by github.com/DataDog/datadog-agent/comp/networkpath/npcollector/npcollectorimpl.(*npCollectorImpl).startWorkers in goroutine 344
	/omnibus/src/datadog-agent/src/github.com/DataDog/datadog-agent/comp/networkpath/npcollector/npcollectorimpl/npcollector.go:445 +0xa5

Describe how you validated your changes

Possible Drawbacks / Trade-offs

Additional Notes

@github-actions github-actions bot added team/networks short review PR is simple enough to be reviewed quickly labels Mar 13, 2025
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Mar 13, 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=58863104 --os-family=ubuntu

Note: This applies to commit e8b30b5

@agent-platform-auto-pr
Copy link
Contributor

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

Uncompressed package size comparison

Comparison with ancestor 4332c2a3c98df4cb1bcbf05d229ac51e2d5fafc4

Diff per package
package diff status size ancestor threshold
datadog-agent-arm64-deb 0.01MB ⚠️ 799.36MB 799.35MB 0.50MB
datadog-agent-aarch64-rpm 0.01MB ⚠️ 809.14MB 809.13MB 0.50MB
datadog-heroku-agent-amd64-deb 0.00MB 441.31MB 441.31MB 0.50MB
datadog-iot-agent-amd64-deb 0.00MB 62.20MB 62.20MB 0.50MB
datadog-iot-agent-x86_64-rpm 0.00MB 62.27MB 62.27MB 0.50MB
datadog-iot-agent-x86_64-suse 0.00MB 62.27MB 62.27MB 0.50MB
datadog-agent-amd64-deb 0.00MB 808.39MB 808.39MB 0.50MB
datadog-agent-x86_64-rpm 0.00MB 818.19MB 818.19MB 0.50MB
datadog-agent-x86_64-suse 0.00MB 818.19MB 818.19MB 0.50MB
datadog-dogstatsd-amd64-deb 0.00MB 39.34MB 39.34MB 0.50MB
datadog-dogstatsd-x86_64-rpm 0.00MB 39.42MB 39.42MB 0.50MB
datadog-dogstatsd-x86_64-suse 0.00MB 39.42MB 39.42MB 0.50MB
datadog-dogstatsd-arm64-deb 0.00MB 37.87MB 37.87MB 0.50MB
datadog-iot-agent-arm64-deb 0.00MB 59.42MB 59.42MB 0.50MB
datadog-iot-agent-aarch64-rpm 0.00MB 59.49MB 59.49MB 0.50MB

Decision

⚠️ Warning

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Mar 13, 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 782.47 MiB 801.8 MiB 190.73 MiB 202.62 MiB
static_quality_gate_agent_deb_arm64 773.81 MiB 793.14 MiB 172.88 MiB 184.51 MiB
static_quality_gate_agent_rpm_amd64 782.32 MiB 801.79 MiB 193.4 MiB 205.03 MiB
static_quality_gate_agent_rpm_arm64 773.73 MiB 793.09 MiB 174.54 MiB 186.44 MiB
static_quality_gate_agent_suse_amd64 782.33 MiB 801.81 MiB 193.4 MiB 205.03 MiB
static_quality_gate_agent_suse_arm64 773.71 MiB 793.14 MiB 174.54 MiB 186.44 MiB
static_quality_gate_dogstatsd_deb_amd64 37.59 MiB 47.67 MiB 9.74 MiB 19.78 MiB
static_quality_gate_dogstatsd_deb_arm64 36.19 MiB 46.27 MiB 8.45 MiB 18.49 MiB
static_quality_gate_dogstatsd_rpm_amd64 37.59 MiB 47.67 MiB 9.75 MiB 19.79 MiB
static_quality_gate_dogstatsd_suse_amd64 37.59 MiB 47.67 MiB 9.75 MiB 19.79 MiB
static_quality_gate_iot_agent_deb_amd64 59.4 MiB 69.0 MiB 14.92 MiB 24.8 MiB
static_quality_gate_iot_agent_deb_arm64 56.75 MiB 66.4 MiB 12.88 MiB 22.8 MiB
static_quality_gate_iot_agent_rpm_amd64 59.39 MiB 69.0 MiB 14.94 MiB 24.8 MiB
static_quality_gate_iot_agent_rpm_arm64 56.74 MiB 66.4 MiB 12.88 MiB 22.8 MiB
static_quality_gate_iot_agent_suse_amd64 59.4 MiB 69.0 MiB 14.94 MiB 24.8 MiB
static_quality_gate_docker_agent_amd64 867.09 MiB 886.12 MiB 291.59 MiB 304.21 MiB
static_quality_gate_docker_agent_arm64 881.74 MiB 900.79 MiB 278.02 MiB 290.47 MiB
static_quality_gate_docker_agent_jmx_amd64 1.04 GiB 1.06 GiB 366.68 MiB 379.33 MiB
static_quality_gate_docker_agent_jmx_arm64 1.04 GiB 1.06 GiB 349.07 MiB 361.55 MiB
static_quality_gate_docker_dogstatsd_amd64 45.73 MiB 55.78 MiB 17.25 MiB 27.28 MiB
static_quality_gate_docker_dogstatsd_arm64 44.36 MiB 54.45 MiB 16.12 MiB 26.16 MiB
static_quality_gate_docker_cluster_agent_amd64 264.87 MiB 274.78 MiB 106.3 MiB 116.28 MiB
static_quality_gate_docker_cluster_agent_arm64 280.81 MiB 290.82 MiB 101.13 MiB 111.12 MiB

Copy link

cit-pr-commenter bot commented Mar 13, 2025

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: afdd3a94-b103-4ba4-ab51-7ddb1c593584

Baseline: 4332c2a
Comparison: e8b30b5
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 +2.35 [-0.54, +5.23] 1 Logs
tcp_syslog_to_blackhole ingress throughput +1.18 [+1.11, +1.24] 1 Logs
file_tree memory utilization +1.06 [+0.84, +1.29] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization +0.51 [-0.32, +1.34] 1 Logs
quality_gate_idle_all_features memory utilization +0.44 [+0.31, +0.57] 1 Logs bounds checks dashboard
file_to_blackhole_1000ms_latency egress throughput +0.20 [-0.58, +0.98] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput +0.02 [-0.78, +0.83] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.02 [-0.66, +0.69] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput +0.01 [-0.78, +0.81] 1 Logs
file_to_blackhole_300ms_latency egress throughput +0.01 [-0.63, +0.64] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.00 [-0.83, +0.82] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.01 [-0.03, +0.02] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.02 [-0.33, +0.29] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.10 [-0.14, -0.06] 1 Logs
file_to_blackhole_500ms_latency egress throughput -0.11 [-0.89, +0.68] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput -0.26 [-0.73, +0.20] 1 Logs
quality_gate_idle memory utilization -0.36 [-0.45, -0.27] 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_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 memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, 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 lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.

@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 14, 2025
@AlexandreYang AlexandreYang marked this pull request as ready for review March 14, 2025 10:16
@AlexandreYang AlexandreYang requested a review from a team as a code owner March 14, 2025 10:16
@AlexandreYang AlexandreYang requested a review from akarpz March 14, 2025 10:16
@github-actions github-actions bot added short review PR is simple enough to be reviewed quickly and removed medium review PR review might take time labels Mar 14, 2025
@AlexandreYang AlexandreYang added changelog/no-changelog qa/done QA done before merge and regressions are covered by tests labels Mar 14, 2025

func incrementIP(ip net.IP) {
for i := len(ip) - 1; i >= 0; i-- {
ip[i]++
Copy link
Contributor

@pimlu pimlu Mar 14, 2025

Choose a reason for hiding this comment

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

You can use (Addr) Next() in the netip package for this.

}
wg.Wait()
s.workersDone <- struct{}{}
Copy link
Contributor

@pimlu pimlu Mar 14, 2025

Choose a reason for hiding this comment

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

Could we remove s.workersDone and store wg as s.workerWg inside npCollectorImpl?

@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 14, 2025
@AlexandreYang
Copy link
Member Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Mar 14, 2025

View all feedbacks in Devflow UI.
2025-03-14 16:54:17 UTC ℹ️ Start processing command /merge


2025-03-14 16:54:25 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.


2025-03-14 16:57:15 UTC ℹ️ MergeQueue: merge request added to the queue

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


2025-03-14 17:27:30 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit aaeaec0 into main Mar 14, 2025
234 checks passed
@dd-mergequeue dd-mergequeue bot deleted the NPM-4311-fix-panic branch March 14, 2025 17:27
@github-actions github-actions bot added this to the 7.65.0 milestone Mar 14, 2025
arbll pushed a commit that referenced this pull request Mar 19, 2025
@pimlu pimlu added the backport/7.64.x Automatically create a backport PR to 7.64.x label Mar 27, 2025
@agent-platform-auto-pr
Copy link
Contributor

The backport to 7.64.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.64.x 7.64.x
# Navigate to the new working tree
cd .worktrees/backport-7.64.x
# Create a new branch
git switch --create backport-35095-to-7.64.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 aaeaec0eb6ecba7c281877966f8c4bb81b4ea612
# Push it to GitHub
git push --set-upstream origin backport-35095-to-7.64.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.64.x

Then, create a pull request where the base branch is 7.64.x and the compare/head branch is backport-35095-to-7.64.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/7.64.x Automatically create a backport PR to 7.64.x changelog/no-changelog medium review PR review might take time qa/done QA done before merge and regressions are covered by tests team/networks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants