Skip to content

chore(trace-items): Add debug data to attribute items endpoint #103988

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

Merged
merged 1 commit into from
Nov 25, 2025
Merged

chore(trace-items): Add debug data to attribute items endpoint #103988

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
113 changes: 59 additions & 54 deletions src/sentry/api/endpoints/organization_trace_item_attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,70 +275,75 @@ def get(self, request: Request, organization: Organization) -> Response:
include_internal = is_active_superuser(request) or is_active_staff(request)

def data_fn(offset: int, limit: int):
rpc_request = TraceItemAttributeNamesRequest(
meta=meta,
limit=limit,
page_token=PageToken(offset=offset),
type=attr_type,
value_substring_match=value_substring_match,
intersecting_attributes_filter=query_filter,
)
with sentry_sdk.start_span(op="query", name="attribute_names") as span:
rpc_request = TraceItemAttributeNamesRequest(
meta=meta,
limit=limit,
page_token=PageToken(offset=offset),
type=attr_type,
value_substring_match=value_substring_match,
intersecting_attributes_filter=query_filter,
)

with handle_query_errors():
rpc_response = snuba_rpc.attribute_names_rpc(rpc_request)

if use_sentry_conventions:
attribute_keys = {}
for attribute in rpc_response.attributes:
if attribute.name and can_expose_attribute(
attribute.name,
trace_item_type,
include_internal=include_internal,
):
attr_key = as_attribute_key(
with handle_query_errors():
rpc_response = snuba_rpc.attribute_names_rpc(rpc_request)

if use_sentry_conventions:
attribute_keys = {}
for attribute in rpc_response.attributes:
if attribute.name and can_expose_attribute(
attribute.name,
serialized["attribute_type"],
trace_item_type,
)
public_alias = attr_key["name"]
replacement = translate_to_sentry_conventions(public_alias, trace_item_type)
if public_alias != replacement:
include_internal=include_internal,
):
attr_key = as_attribute_key(
replacement,
attribute.name,
serialized["attribute_type"],
trace_item_type,
)

attribute_keys[attr_key["name"]] = attr_key

attributes = list(attribute_keys.values())
public_alias = attr_key["name"]
replacement = translate_to_sentry_conventions(
public_alias, trace_item_type
)
if public_alias != replacement:
attr_key = as_attribute_key(
replacement,
serialized["attribute_type"],
trace_item_type,
)

attribute_keys[attr_key["name"]] = attr_key

attributes = list(attribute_keys.values())
sentry_sdk.set_context("api_response", {"attributes": attributes})
return attributes
Copy link
Contributor

@cursor cursor bot Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Missing span debug data in sentry conventions branch

The span.set_data() calls for attribute_count and attribute_type are only executed in the use_sentry_conventions=False branch. When use_sentry_conventions is True, the function returns early at line 319 without setting this debug data on the span. Given this PR intends to add debug data to the endpoint, this inconsistency appears to be an oversight.

Additional Locations (1)

Fix in Cursor Fix in Web


attributes = list(
filter(
lambda x: not is_sentry_convention_replacement_attribute(
x["name"], trace_item_type
),
[
as_attribute_key(
attribute.name,
serialized["attribute_type"],
trace_item_type,
)
for attribute in rpc_response.attributes
if attribute.name
and can_expose_attribute(
attribute.name,
trace_item_type,
include_internal=include_internal,
)
],
)
)
sentry_sdk.set_context("api_response", {"attributes": attributes})
span.set_data("attribute_count", len(attributes))
span.set_data("attribute_type", attribute_type)
return attributes

attributes = list(
filter(
lambda x: not is_sentry_convention_replacement_attribute(
x["name"], trace_item_type
),
[
as_attribute_key(
attribute.name,
serialized["attribute_type"],
trace_item_type,
)
for attribute in rpc_response.attributes
if attribute.name
and can_expose_attribute(
attribute.name,
trace_item_type,
include_internal=include_internal,
)
],
)
)
sentry_sdk.set_context("api_response", {"attributes": attributes})
return attributes

return self.paginate(
request=request,
paginator=TraceItemAttributesNamesPaginator(data_fn=data_fn),
Expand Down
Loading