Fix concurrent access to enabled features in metrics forwarder - #3412
Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit intoSep 1, 2026
Merged
Conversation
The metrics forwarding loop could iterate over EnabledFeatures while a reconciliation updated the map, causing a fatal concurrent map iteration and map write error. Clone the map under a read lock and iterate over the snapshot, avoiding concurrent access without holding the lock while sending metrics. This fix doesn't fix the potential of map value slices concurrent modifications, however, that scenario is currently not present in the code as the values are set as whole slices and guarded by the setEnabledFeatures(..) function.
tbavelier
approved these changes
Sep 1, 2026
Member
|
Thank you for the contribution! |
gh-worker-dd-mergequeue-cf854d
Bot
merged commit Sep 1, 2026
16eca47
into
DataDog:main
68 of 70 checks passed
gh-worker-dd-devflow-36fce6
Bot
added
mergequeue-status: done
and removed
mergequeue-status: in_progress
labels
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
The metrics forwarding loop could iterate over
EnabledFeatureswhile a reconciliation updated the map, causing a fatal concurrent map iteration and map write error.This commit clones the map under a read lock and makes the existing code iterate over the snapshot, avoiding concurrent access without holding the lock while sending metrics.
Motivation
Observed
concurrent map iteration and map writeerrors causing the operator to crash.Additional Notes
This fix doesn't fix the potential of map value slices concurrent modifications, however, that scenario is currently not present in the code as the values are set as whole slices and guarded by the
setEnabledFeatures(..)function.While browsing the code, I noticed that the
EnabledFeaturesmap only holds one key, which is theidof this forwarder. This id is set only at creation time and the no longer changed. This creates an opportunity for simplification here, by turningEnabledFeaturesinto a slice instead.Describe your test plan
Write there any instructions and details you may have to test your PR.
Checklist
bug,enhancement,refactoring,documentation,tooling, and/ordependenciesqa/skip-qalabel