Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix trace context in event payload #2205

Merged
merged 13 commits into from
Jun 28, 2023
Merged

Fix trace context in event payload #2205

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
20073a7
Updated trace_propagation_meta to use new top level api
antonpirker Jun 27, 2023
96c8d65
Refactoring
antonpirker Jun 27, 2023
abba90f
Merge branch 'master' into antonpirker/trace-meta-base
antonpirker Jun 27, 2023
9b8a3cf
Make sure the trace context in event payload is always set.
antonpirker Jun 27, 2023
375d077
Make sure trace_id is set from propagation context if existing.
antonpirker Jun 27, 2023
7b90103
fix
antonpirker Jun 27, 2023
4f07263
fix
antonpirker Jun 27, 2023
36ac71b
One PR one fix
antonpirker Jun 28, 2023
a9f9c4d
typo
antonpirker Jun 28, 2023
937641d
Merge branch 'master' into antonpirker/fix-trace-id2
antonpirker Jun 28, 2023
d4f4d92
If trace context is already present, do not overwrite it. (this used …
antonpirker Jun 28, 2023
37709ac
Merge branch 'master' into antonpirker/fix-trace-id2
antonpirker Jun 28, 2023
1049b54
Update sentry_sdk/scope.py
antonpirker Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sentry_sdk/scope.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,11 +605,11 @@ def _drop(cause, ty):

contexts = event.setdefault("contexts", {})

if has_tracing_enabled(options):
if self._span is not None:
if contexts.get("trace") is None:
if has_tracing_enabled(options) and self._span is not None:
contexts["trace"] = self._span.get_trace_context()
else:
contexts["trace"] = self.get_trace_context()
else:
contexts["trace"] = self.get_trace_context()

exc_info = hint.get("exc_info")
if exc_info is not None:
Expand Down