Skip to content

fix(spans): Support None and full uint64 in span.data #92211

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.

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
May 23, 2025
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
7 changes: 6 additions & 1 deletion src/sentry/spans/consumers/process_segments/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

from sentry.spans.consumers.process_segments.types import Span

I64_MAX = 2**63 - 1

FIELD_TO_ATTRIBUTE = {
"description": "sentry.raw_description",
"duration_ms": "sentry.duration_ms",
Expand All @@ -38,7 +40,8 @@ def convert_span_to_item(span: Span) -> TraceItem:
server_sample_rate = 1.0

for k, v in (span.get("data") or {}).items():
attributes[k] = _anyvalue(v)
if v is not None:
attributes[k] = _anyvalue(v)

for k, v in (span.get("measurements") or {}).items():
if k is not None and v is not None:
Expand Down Expand Up @@ -87,6 +90,8 @@ def _anyvalue(value: Any) -> AnyValue:
elif isinstance(value, bool):
return AnyValue(bool_value=value)
elif isinstance(value, int):
if value > I64_MAX:
return AnyValue(double_value=float(value))
return AnyValue(int_value=value)
elif isinstance(value, float):
return AnyValue(double_value=value)
Expand Down
16 changes: 15 additions & 1 deletion tests/sentry/spans/consumers/process_segments/test_convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from google.protobuf.timestamp_pb2 import Timestamp
from sentry_protos.snuba.v1.request_common_pb2 import TraceItemType
from sentry_protos.snuba.v1.trace_item_pb2 import AnyValue
from sentry_protos.snuba.v1.trace_item_pb2 import AnyValue, KeyValue, KeyValueList

from sentry.spans.consumers.process_segments.convert import convert_span_to_item
from sentry.spans.consumers.process_segments.types import Span
Expand Down Expand Up @@ -30,6 +30,11 @@
"my.neg.float.field": -101.2,
"my.true.bool.field": True,
"my.false.bool.field": False,
"my.dict.field": {
"id": 42,
"name": "test",
},
"my.u64.field": 9447000002305251000,
},
"measurements": {
"num_of_spans": {"value": 50.0},
Expand Down Expand Up @@ -145,4 +150,13 @@ def test_convert_span_to_item():
"relay_use_post_or_schedule_rejected": AnyValue(string_value="version"),
"sentry.normalized_description": AnyValue(string_value="normalized_description"),
"thread.name": AnyValue(string_value="uWSGIWorker1Core0"),
"my.dict.field": AnyValue(
kvlist_value=KeyValueList(
values=[
KeyValue(key="id", value=AnyValue(int_value=42)),
KeyValue(key="name", value=AnyValue(string_value="test")),
]
)
),
"my.u64.field": AnyValue(double_value=9447000002305251000.0),
}
Loading