Skip to content

chore: Remove Scope._gen_ai_original_message_count #7489

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.

Sign up for GitHub

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
alexander-alderman-webb merged 3 commits into from
Sep 14, 2026
Merged

chore: Remove Scope._gen_ai_original_message_count #7489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bba05f6
chore: Remove Scope._gen_ai_original_message_count
alexander-alderman-webb Sep 14, 2026
19f6b85
fully remove
alexander-alderman-webb Sep 14, 2026
746fcb6
merge
alexander-alderman-webb Sep 14, 2026
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
17 changes: 0 additions & 17 deletions sentry_sdk/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from sentry_sdk.consts import (
DEFAULT_MAX_VALUE_LENGTH,
DEFAULT_OPTIONS,
SPANDATA,
SPANSTATUS,
VERSION,
ClientConstructor,
Expand Down Expand Up @@ -777,22 +776,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": []}),
Expand Down
7 changes: 0 additions & 7 deletions sentry_sdk/scope.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ class Scope:
"_extras",
"_breadcrumbs",
"_n_breadcrumbs_truncated",
"_gen_ai_original_message_count",
Comment thread
alexander-alderman-webb marked this conversation as resolved.
Resolved
"_gen_ai_conversation_id",
"_event_processors",
"_error_processors",
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Loading