Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 20 additions & 1 deletion sentry_sdk/tracing_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,17 +309,36 @@ def compute_tracestate_entry(span):
"""
data = {}

client = (span.hub or sentry_sdk.Hub.current).client
hub = span.hub or sentry_sdk.Hub.current

client = hub.client
scope = hub.scope

if client and client.options.get("dsn"):
options = client.options
user = scope._user

data = {
"trace_id": span.trace_id,
"environment": options["environment"],
"release": options.get("release"),
"public_key": Dsn(options["dsn"]).public_key,
}

if user and (user.get("id") or user.get("segment")):
user_data = {}

if user.get("id"):
user_data["id"] = user["id"]

if user.get("segment"):
user_data["segment"] = user["segment"]

data["user"] = user_data

if span.containing_transaction:
data["transaction"] = span.containing_transaction.name

return "sentry=" + compute_tracestate_value(data)

return None
Expand Down
4 changes: 4 additions & 0 deletions tests/tracing/test_http_headers.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ def test_tracestate_computation(sentry_init):
release="off.leash.park",
)

sentry_sdk.set_user({"id": 12312013, "segment": "bigs"})

transaction = Transaction(
name="/interactions/other-dogs/new-dog",
op="greeting.sniff",
Expand All @@ -46,6 +48,8 @@ def test_tracestate_computation(sentry_init):
"environment": "dogpark",
"release": "off.leash.park",
"public_key": "dogsarebadatkeepingsecrets",
"user": {"id": 12312013, "segment": "bigs"},
"transaction": "/interactions/other-dogs/new-dog",
}


Expand Down