fix(scopes): don't drop propagation context when event already has contexts#1843
Merged
Merged
Conversation
limbonaut
commented
Jul 6, 2026
| } | ||
| PLACE_VALUE("contexts", contexts); | ||
| } else { | ||
| sentry__value_merge_objects(event_contexts, contexts); |
Collaborator
Author
There was a problem hiding this comment.
Notice that the else branch skips adding propagation context altogether. So, just having pre-existing contexts omits adding trace completely.
limbonaut
changed the title
JoshuaMoelans
approved these changes
Jul 7, 2026
jpnurmi
approved these changes
Jul 7, 2026
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
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.
When a scope is applied to an event, the trace context created by
sentry_set_trace()was only added if the event had no existing contexts. This creates a problem when a local scope is applied before the global scope, because it adds contexts to event and the trace infomation is skipped so the event loses its trace id. This PR fixes this by ensuring the propagation context is applied whenever an event doesn't already have a trace or active span. Also, adding tests to verify correct behavior.