chore: Remove Scope._gen_ai_original_message_count (#7489)

This original message count is never set since truncation for GenAI spans was removed.

Author: alexander-alderman-webb

sentry_sdk/client.py

@@ -18,7 +18,6 @@
 from sentry_sdk.consts import (
     DEFAULT_MAX_VALUE_LENGTH,
     DEFAULT_OPTIONS,
-    SPANDATA,
     SPANSTATUS,
     VERSION,
     ClientConstructor,
@@ -780,22 +779,6 @@ def _prepare_event(
             if event_scrubber:
                 event_scrubber.scrub_event(event)
 
-        if scope is not None and scope._gen_ai_original_message_count:
-            spans: "List[Dict[str, Any]] | AnnotatedValue" = event.get("spans", [])
-            if isinstance(spans, list):
-                for span in spans:
-                    span_id = span.get("span_id", None)
-                    span_data = span.get("data", {})
-                    if (
-                        span_id
-                        and span_id in scope._gen_ai_original_message_count
-                        and SPANDATA.GEN_AI_REQUEST_MESSAGES in span_data
-                    ):
-                        span_data[SPANDATA.GEN_AI_REQUEST_MESSAGES] = AnnotatedValue(
-                            span_data[SPANDATA.GEN_AI_REQUEST_MESSAGES],
-                            {"len": scope._gen_ai_original_message_count[span_id]},
-                        )
-
         if previous_total_breadcrumbs is not None:
             event["breadcrumbs"] = AnnotatedValue(
                 event.get("breadcrumbs", {"values": []}),

sentry_sdk/scope.py

@@ -212,7 +212,6 @@ class Scope:
         "_extras",
         "_breadcrumbs",
         "_n_breadcrumbs_truncated",
-        "_gen_ai_original_message_count",
         "_gen_ai_conversation_id",
         "_event_processors",
         "_error_processors",
@@ -243,7 +242,6 @@ def __init__(
         self._name: "Optional[str]" = None
         self._propagation_context: "Optional[PropagationContext]" = None
         self._n_breadcrumbs_truncated: int = 0
-        self._gen_ai_original_message_count: "Dict[str, int]" = {}
 
         self._server_segment_span: "Optional[StreamedSpan]" = None
 
@@ -279,7 +277,6 @@ def __copy__(self) -> "Scope":
 
         rv._breadcrumbs = copy(self._breadcrumbs)
         rv._n_breadcrumbs_truncated = self._n_breadcrumbs_truncated
-        rv._gen_ai_original_message_count = self._gen_ai_original_message_count.copy()
         rv._event_processors = self._event_processors.copy()
         rv._error_processors = self._error_processors.copy()
         rv._propagation_context = self._propagation_context
@@ -1630,10 +1627,6 @@ def update_from_scope(self, scope: "Scope") -> None:
             self._n_breadcrumbs_truncated = (
                 self._n_breadcrumbs_truncated + scope._n_breadcrumbs_truncated
             )
-        if scope._gen_ai_original_message_count:
-            self._gen_ai_original_message_count.update(
-                scope._gen_ai_original_message_count
-            )
         if scope._gen_ai_conversation_id:
             self._gen_ai_conversation_id = scope._gen_ai_conversation_id
         if scope._span: