fix(sampling): sentry-trace should take precedence over baggage - #6863
Merged
sentrivana merged 5 commits intoJul 23, 2026
Merged
fix(sampling): sentry-trace should take precedence over baggage#6863sentrivana merged 5 commits into
sentrivana merged 5 commits into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Copy link
Copy Markdown
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
Codecov Results 📊✅ 95930 passed | ⏭️ 6340 skipped | Total: 102270 | Pass Rate: 93.8% | Execution Time: 336m 27s 📊 Comparison with Base Branch
All tests are passing successfully. ✅ Patch coverage is 83.33%. Project has 2512 uncovered lines.
@@ Coverage Diff @@
## main #PR +/-##
==========================================
+ Coverage 89.65% 89.67% +0.02%
==========================================
Files 193 193 —
Lines 24324 24321 -3
Branches 8572 8572 —
==========================================
+ Hits 21807 21809 +2
- Misses 2517 2512 -5
- Partials 1395 1397 +2Generated by Codecov Action |
Sorry, something went wrong.
sentrivana
marked this pull request as ready for review
July 23, 2026 09:44
ericapisani
approved these changes
Jul 23, 2026
ericapisani
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
LGTM, just noticed a small thing
Sorry, something went wrong.
Comment thread
tests/tracing/test_span_streaming.py
Outdated
Comment on lines
+1028
to
+1030
| "sentry-sample_rate": "0.75", | ||
| "sentry-sample_rand": "0.500000", | ||
| "sentry-sampled": "true", |
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
Why not add these to the initial definition of incoming_baggage above?
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
Author
There was a problem hiding this comment.
Thanks for noticing! Copied this test from another one that only did this conditionally and missed this.
Fixed in ddc7386
Sorry, something went wrong.
alexander-alderman-webb
approved these changes
Jul 23, 2026
sentrivana
enabled auto-merge (squash)
July 23, 2026 14:21
mgaligniana
pushed a commit
to mgaligniana/sentry-python
that referenced
this pull request
Aug 9, 2026
…tsentry#6863) ### Description We were making the wrong sampling decision in a specific case: when the incoming `sentry-trace` ended in `-0`, but the incoming baggage had a combination of `sentry-sample_rate` and `sentry-sample_rand` that would've actually produced a positive sampling decision, we would prioritize the information from the baggage over the parent sampling decision from `sentry-trace`. This PR aligns the behavior with the legacy codepath, where we'd set `parent_sampled` as the new `sample_rate`. #### Issues * closes https://linear.app/getsentry/issue/PY-2618/incorrect-sampling-decision-propagated-in-some-cases-in-span-streaming * closes getsentry#6856 #### Reminders - Please add tests to validate your changes, and lint your code using `uv run ruff`. - Add GH Issue ID _&_ Linear ID (if applicable) - PR title should use [conventional commit](https://develop.sentry.dev/engineering-practices/commit-messages/#type) style (`feat:`, `fix:`, `ref:`, `meta:`) - For external contributors: [CONTRIBUTING.md](https://github.com/getsentry/sentry-python/blob/master/CONTRIBUTING.md), [Sentry SDK development docs](https://develop.sentry.dev/sdk/), [Discord community](https://discord.gg/Ww9hbqr)
6 tasks
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
Reviewers
3 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.
Description
We were making the wrong sampling decision in a specific case: when the incoming sentry-trace ended in -0, but the incoming baggage had a combination of sentry-sample_rate and sentry-sample_rand that would've actually produced a positive sampling decision, we would prioritize the information from the baggage over the parent sampling decision from sentry-trace.
This PR aligns the behavior with the legacy codepath, where we'd set parent_sampled as the new sample_rate.
Issues
Reminders