attributes[sentry.is_segment] -> is_segment

Author: jjbayer

src/sentry/spans/buffer.py

@@ -438,10 +438,7 @@ def flush_segments(self, now: int) -> dict[SegmentKey, FlushedSegment]:
                     }
 
                 is_segment = segment_span_id == span["span_id"]
-                span.setdefault("attributes", {})["sentry.is_segment"] = {
-                    "type": "boolean",
-                    "value": is_segment,
-                }
+                span["is_segment"] = is_segment
                 if is_segment:
                     has_root_span = True
 

src/sentry/spans/consumers/process_segments/convert.py

@@ -17,6 +17,7 @@
     "hash": "sentry.hash",
     # TODO(INGEST-612): Remove "is_remote" once Relay writes this attribute.
     "is_remote": "sentry.is_remote",
+    "is_segment": "sentry.is_segment",
     "kind": "sentry.kind",
     "name": "sentry.name",
     "parent_span_id": "sentry.parent_span_id",

src/sentry/spans/consumers/process_segments/enrichment.py

@@ -60,7 +60,7 @@ def _find_segment_span(spans: list[SpanEvent]) -> SpanEvent | None:
 
     # Iterate backwards since we usually expect the segment span to be at the end.
     for span in reversed(spans):
-        if attribute_value(span, "sentry.is_segment"):
+        if span.get("is_segment"):
             return span
 
     return None

src/sentry/spans/consumers/process_segments/shim.py

@@ -33,7 +33,6 @@ def make_compatible(span: SpanEvent) -> CompatibleSpan:
         "sentry_tags": _sentry_tags(span.get("attributes") or {}),
         "op": get_span_op(span),
         "exclusive_time": attribute_value(span, "sentry.exclusive_time_ms"),
-        "is_segment": bool(attribute_value(span, "sentry.is_segment")),
     }
 
     return ret

src/sentry/spans/consumers/process_segments/types.py

@@ -31,7 +31,6 @@ class CompatibleSpan(SpanEvent, total=True):
     exclusive_time: float
     op: str
     sentry_tags: dict[str, str]
-    is_segment: bool
 
     # Added by `SpanGroupingResults.write_to_spans` in `_enrich_spans`
     hash: NotRequired[str]

src/sentry/spans/grouping/strategy/base.py

@@ -57,7 +57,7 @@ def get_standalone_span_group(self, span: Span) -> str:
         # compatibility with transaction events, but fall back to default
         # fingerprinting if the span doesn't have a transaction.
         if (
-            attribute_value(span, "sentry.is_segment")
+            span.get("is_segment")
             and (transaction := attribute_value(span, "sentry.transaction")) is not None
         ):
             result = Hash()

tests/sentry/spans/consumers/process/__init__.py

@@ -3,7 +3,7 @@
 
 def build_mock_span(project_id, *, span_op=None, is_segment=False, attributes=None, **kwargs):
     span: SpanEvent = {
-        "is_segment": is_segment,
+        "is_remote": is_segment,
         "parent_span_id": None,
         "project_id": project_id,
         "organization_id": 1,