fix(sampling): isolate manual sampling test trace contexts - #7698
Open
bm1549 wants to merge 2 commits into
Open
Conversation
Contributor
|
|
|
✅ All CI checks and tests passed. 🎉 All green!🧪 All tests passed 🔗 Commit SHA: 1579c77 | Docs | View more details | Give us feedback! |
bm1549
marked this pull request as ready for review
September 11, 2026 01:57
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
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
Trace ID overlap report (AppGate required)
The manual-sampling tests used the same upstream trace and parent IDs for the keep and drop cases. When uWSGI handled the two requests at once, dd-trace-py correctly grouped their spans into one trace, and the drop request had no serialized sampling priority.
Changes
The upstream-context helper now offsets its fixed IDs by the upstream sampling priority. Each case stays stable for lineage assertions, while keep and drop use separate trace and parent IDs.
Tests
uwsgi-poc, and Agent 7.83.1: 5/5 expected failures with shared IDs; 5/5 passes with isolated IDsTEST_LIBRARY=python ./run.sh SAMPLING tests/test_sampling_manual.py::Test_Manual_Sampling: 2 passed./run.sh TEST_THE_TEST tests/test_the_test/test_sampling_manual.py: 1 passed./format.sh --check: passedWorkflow
🚀 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