Attempt to fix race conditions in 'set_and_wait_rc' by counting telem…#6371
Draft
vlad-scherbich wants to merge 1 commit intomainfrom
Draft
Attempt to fix race conditions in 'set_and_wait_rc' by counting telem…#6371vlad-scherbich wants to merge 1 commit intomainfrom
vlad-scherbich wants to merge 1 commit intomainfrom
Conversation
Contributor
|
|
5 tasks
This comment has been minimized.
This comment has been minimized.
8842b4c to
1efc4da
Compare
1efc4da to
a8cf21a
Compare
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
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.
Motivation
~25 of 32 system test failures on dd-trace-py main in 2026 stem from dynamic configuration tests. Root cause: a race in
set_and_wait_rc—it can match staleapp-client-configuration-changetelemetry events from a previous RC update and return before the new config is actually applied.Changes
set_and_wait_rc: Replacewait_for_telemetry_event(..., clear=True)with telemetry event counting. Snapshot the count ofapp-client-configuration-changeevents before setting RC, then poll until the count increases—guaranteeing we match a genuinely new event, not a stale one.test_capability_tracing_sample_rules: Increasewait_loopsfrom 100 to 400 (~4s) so the library has enough time to send its first RC request._MAX_RC_EVENT_WAIT_LOOPS: Add module-level constant (400) for the RC event polling loop instead of a magic number.Files modified:
tests/parametric/test_dynamic_configuration.pyWorkflow
🚀 Once your PR is reviewed and the CI green, you can merge it!
🛟 #apm-shared-testing 🛟
Reviewer checklist
tests/ormanifests/is modified ? I have the approval from R&P teambuild-XXX-imagelabel is present