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
1 change: 1 addition & 0 deletions sentry_sdk/scope.py
Original file line number Diff line number Diff line change
Expand Up @@ -1741,6 +1741,7 @@ def _apply_user_attributes_to_telemetry(
("user.id", "id"),
("user.name", "username"),
("user.email", "email"),
("user.ip_address", "ip_address"),
):
if user_attribute in self._user and attribute_name not in attributes:
attributes[attribute_name] = self._user[user_attribute]
Expand Down
38 changes: 38 additions & 0 deletions tests/test_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,41 @@ class Cat:
# Attrs originally from the scope are serialized when sent
assert isinstance(metric["attributes"]["instance"], str)
assert isinstance(metric["attributes"]["dictionary"], str)


def test_user_attributes(sentry_init, capture_items):
sentry_init(
traces_sample_rate=1.0,
send_default_pii=True,
_experiments={
"trace_lifecycle": "stream",
},
)

items = capture_items("trace_metric", "span")

sentry_sdk.set_user(
{
"id": "123456",
"username": "username",
"email": "username@example.com",
"ip_address": "127.0.0.1",
}
)

with sentry_sdk.traces.start_span(name="login"):
sentry_sdk.metrics.count("test", 1)

sentry_sdk.get_client().flush()

metric, span = [item.payload for item in items]

assert metric["attributes"]["user.id"] == "123456"
assert metric["attributes"]["user.name"] == "username"
assert metric["attributes"]["user.email"] == "username@example.com"
assert metric["attributes"]["user.ip_address"] == "127.0.0.1"

assert span["attributes"]["user.id"] == "123456"
assert span["attributes"]["user.name"] == "username"
assert span["attributes"]["user.email"] == "username@example.com"
assert span["attributes"]["user.ip_address"] == "127.0.0.1"
Loading