From bba05f6334e7d0c005287d1d1754b685b6ddc25a Mon Sep 17 00:00:00 2001 From: Alexander Alderman Webb Date: Mon, 14 Sep 2026 09:58:06 +0200 Subject: [PATCH 1/2] chore: Remove Scope._gen_ai_original_message_count --- sentry_sdk/scope.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py index 76ec2cda2a..25c3d0b637 100644 --- a/sentry_sdk/scope.py +++ b/sentry_sdk/scope.py @@ -225,7 +225,6 @@ class Scope: "_extras", "_breadcrumbs", "_n_breadcrumbs_truncated", - "_gen_ai_original_message_count", "_gen_ai_conversation_id", "_event_processors", "_error_processors", @@ -256,7 +255,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 @@ -292,7 +290,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 @@ -1863,10 +1860,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: From 19f6b854eba923e0e3a43135872e4f825b94337a Mon Sep 17 00:00:00 2001 From: Alexander Alderman Webb Date: Mon, 14 Sep 2026 10:00:11 +0200 Subject: [PATCH 2/2] fully remove --- sentry_sdk/client.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py index ce184ffd44..0caab98cb4 100644 --- a/sentry_sdk/client.py +++ b/sentry_sdk/client.py @@ -18,7 +18,6 @@ from sentry_sdk.consts import ( DEFAULT_MAX_VALUE_LENGTH, DEFAULT_OPTIONS, - SPANDATA, SPANSTATUS, VERSION, ClientConstructor, @@ -828,21 +827,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_spans is not None: event["spans"] = AnnotatedValue( event.get("spans", []), {"len": previous_total_spans}