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

Wrap Baggage serialization/deserialization in capture_internal_exceptions #1630

Merged
merged 3 commits into from
Sep 19, 2022
Merged

Wrap Baggage serialization/deserialization in capture_internal_exceptions #1630

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aea21ee
Wrap Baggage ser/deser in capture_internal_exceptions
sl0thentr0py Sep 19, 2022
a8ac1c7
Merge branch 'master' into neel/fix-baggage-ser-deser
sl0thentr0py Sep 19, 2022
2f741dc
Merge branch 'master' into neel/fix-baggage-ser-deser
sl0thentr0py Sep 19, 2022
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
23 changes: 13 additions & 10 deletions sentry_sdk/tracing_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,14 +459,16 @@ def from_incoming_header(cls, header):
for item in header.split(","):
if "=" not in item:
continue
item = item.strip()
key, val = item.split("=")
if Baggage.SENTRY_PREFIX_REGEX.match(key):
baggage_key = unquote(key.split("-")[1])
sentry_items[baggage_key] = unquote(val)
mutable = False
else:
third_party_items += ("," if third_party_items else "") + item

with capture_internal_exceptions():
item = item.strip()
key, val = item.split("=")
if Baggage.SENTRY_PREFIX_REGEX.match(key):
baggage_key = unquote(key.split("-")[1])
sentry_items[baggage_key] = unquote(val)
mutable = False
else:
third_party_items += ("," if third_party_items else "") + item

return Baggage(sentry_items, third_party_items, mutable)

Expand Down Expand Up @@ -538,8 +540,9 @@ def serialize(self, include_third_party=False):
items = []

for key, val in iteritems(self.sentry_items):
item = Baggage.SENTRY_PREFIX + quote(key) + "=" + quote(val)
items.append(item)
with capture_internal_exceptions():
item = Baggage.SENTRY_PREFIX + quote(key) + "=" + quote(str(val))
items.append(item)

if include_third_party:
items.append(self.third_party_items)
Expand Down