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
4 changes: 3 additions & 1 deletion src/sentry/spans/buffer.py
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,9 @@ def flush_segments(self, now: int) -> dict[SegmentKey, FlushedSegment]:
span = orjson.loads(payload)

if not attribute_value(span, "sentry.segment.id"):
span.setdefault("attributes", {})["sentry.segment.id"] = {
if not isinstance(span.get("attributes"), dict):
span["attributes"] = {}
span["attributes"]["sentry.segment.id"] = {
"type": "string",
"value": segment_span_id,
}
Expand Down
21 changes: 21 additions & 0 deletions tests/sentry/spans/test_buffer.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,27 @@ def test_observability_metrics_parent_span_already_oversized(
)


def test_flush_segments_with_null_attributes(buffer: SpansBuffer) -> None:
spans = [
Span(
payload=orjson.dumps({"span_id": "b" * 16, "attributes": None}),
trace_id="a" * 32,
span_id="b" * 16,
parent_span_id=None,
segment_id=None,
is_segment_span=True,
project_id=1,
end_timestamp=1700000000.0,
),
]

process_spans(spans, buffer, now=0)

rv = buffer.flush_segments(now=11)
segment = rv[_segment_id(1, "a" * 32, "b" * 16)]
assert segment.spans[0].payload["attributes"]["sentry.segment.id"]["value"] == "b" * 16


@pytest.mark.parametrize(
"spans",
list(
Expand Down
Loading