chore: More transaction cleanup, drop "streamed" from names

MIGRATION_GUIDE.md

@@ -157,6 +157,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 - `SanicIntegration` no longer accepts `unsampled_statuses`.
 - The `trace_ignore_status_codes` option was removed.
 - `add_attachment` no longer accepts an `add_to_transactions` argument.
+- The `stream_gen_ai_spans` option was removed. All spans are streamed now.
 
 
 ## Deprecated

sentry_sdk/_types.py

@@ -367,7 +367,7 @@ class DataCollection(TypedDict):
             "start_timestamp": float,
             "end_timestamp": NotRequired[float],
             "attributes": NotRequired[Attributes],
-            "_segment_span": NotRequired["sentry_sdk.traces.StreamedSpan"],
+            "_segment_span": NotRequired["sentry_sdk.traces.Span"],
         },
     )
 

sentry_sdk/ai/monitoring.py

@@ -5,13 +5,13 @@
 if TYPE_CHECKING:
     from typing import Any, Awaitable, Callable, Optional, TypeVar, Union
 
-    from sentry_sdk.traces import StreamedSpan
+    from sentry_sdk.traces import Span
 
     F = TypeVar("F", bound=Union[Callable[..., Any], Callable[..., Awaitable[Any]]])
 
 
 def record_token_usage(
-    span: "StreamedSpan",
+    span: "Span",
     input_tokens: "Optional[int]" = None,
     input_tokens_cached: "Optional[int]" = None,
     input_tokens_cache_write: "Optional[int]" = None,

sentry_sdk/ai/utils.py

@@ -5,7 +5,7 @@
 if TYPE_CHECKING:
     from typing import Any, Dict, Optional, Tuple
 
-    from sentry_sdk.traces import StreamedSpan
+    from sentry_sdk.traces import Span
 
 import sentry_sdk
 from sentry_sdk.utils import logger
@@ -448,7 +448,7 @@ def _normalize_data(data: "Any", unpack: bool = True) -> "Any":
 
 
 def set_data_normalized(
-    span: "StreamedSpan",
+    span: "Span",
     key: str,
     value: "Any",
     unpack: bool = True,

sentry_sdk/api.py

@@ -28,7 +28,7 @@
         LogLevelStr,
     )
     from sentry_sdk.client import BaseClient
-    from sentry_sdk.traces import StreamedSpan
+    from sentry_sdk.traces import Span
 
     T = TypeVar("T")
     F = TypeVar("F", bound=Callable[..., Any])
@@ -267,11 +267,11 @@ async def flush_async(
 
 
 @scopemethod
-def start_span(**kwargs: "Any") -> "StreamedSpan":
+def start_span(**kwargs: "Any") -> "Span":
     return traces.start_span(**kwargs)
 
 
-def get_current_span(scope: "Optional[Scope]" = None) -> "Optional[StreamedSpan]":
+def get_current_span(scope: "Optional[Scope]" = None) -> "Optional[Span]":
     """
     Returns the currently active span if there is one running, otherwise `None`
     """

sentry_sdk/client.py

@@ -30,7 +30,7 @@
 from sentry_sdk.scrubber import EventScrubber
 from sentry_sdk.serializer import serialize
 from sentry_sdk.sessions import SessionFlusher
-from sentry_sdk.traces import StreamedSpan, trace
+from sentry_sdk.traces import Span, trace
 from sentry_sdk.transport import (
     AsyncHttpTransport,
     HttpTransportCore,
@@ -70,7 +70,7 @@
     from sentry_sdk.scope import Scope
     from sentry_sdk.session import Session
     from sentry_sdk.spotlight import SpotlightClient
-    from sentry_sdk.traces import StreamedSpan
+    from sentry_sdk.traces import Span
     from sentry_sdk.transport import Item, Transport
     from sentry_sdk.utils import Dsn
 
@@ -215,7 +215,7 @@ def _capture_log(self, log: "Log", scope: "Scope") -> None:
     def _capture_metric(self, metric: "Metric", scope: "Scope") -> None:
         pass
 
-    def _capture_span(self, span: "StreamedSpan", scope: "Scope") -> None:
+    def _capture_span(self, span: "Span", scope: "Scope") -> None:
         pass
 
     def capture_session(self, *args: "Any", **kwargs: "Any") -> None:
@@ -815,7 +815,7 @@ def capture_event(
 
     def _capture_telemetry(
         self,
-        telemetry: "Optional[Union[Log, Metric, StreamedSpan]]",
+        telemetry: "Optional[Union[Log, Metric, Span]]",
         ty: str,
         scope: "Scope",
     ) -> None:
@@ -864,7 +864,7 @@ def _capture_telemetry(
                 if serialized is None:
                     return
 
-            elif ty == "span" and isinstance(telemetry, StreamedSpan):
+            elif ty == "span" and isinstance(telemetry, Span):
                 # Reset the span to its original value before we attempted
                 # to call the `before_send_span` callback
                 if exception_raised_in_before_send_func:
@@ -908,7 +908,7 @@ def _capture_log(self, log: "Optional[Log]", scope: "Scope") -> None:
     def _capture_metric(self, metric: "Optional[Metric]", scope: "Scope") -> None:
         self._capture_telemetry(metric, "metric", scope)
 
-    def _capture_span(self, span: "Optional[StreamedSpan]", scope: "Scope") -> None:
+    def _capture_span(self, span: "Optional[Span]", scope: "Scope") -> None:
         self._capture_telemetry(span, "span", scope)
 
     def capture_session(

sentry_sdk/consts.py

@@ -1313,7 +1313,6 @@ def __init__(
         before_send_span: "Optional[Callable[[SpanJSON, Hint], Optional[SpanJSON]]]" = None,
         org_id: "Optional[str]" = None,
         strict_trace_continuation: bool = False,
-        stream_gen_ai_spans: bool = True,
     ) -> None:
         """Initialize the Sentry SDK with the given parameters. All parameters described here can be used in a call to `sentry_sdk.init()`.
 

sentry_sdk/integrations/aiohttp.py

@@ -22,8 +22,8 @@
 from sentry_sdk.sessions import track_session
 from sentry_sdk.traces import (
     SegmentNameSource,
+    Span,
     SpanStatus,
-    StreamedSpan,
 )
 from sentry_sdk.tracing import (
     BAGGAGE_HEADER_NAME,
@@ -342,7 +342,7 @@ async def on_request_start(
             parsed_url.url if parsed_url else SENSITIVE_DATA_SUBSTITUTE,
         )
 
-        span: "Optional[StreamedSpan]" = None
+        span: "Optional[Span]" = None
         attributes: "Attributes" = {
             "sentry.op": OP.HTTP_CLIENT,
             "sentry.origin": AioHttpIntegration.origin,

sentry_sdk/integrations/aiomysql.py

@@ -6,7 +6,7 @@
 import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration, _check_minimum_version
-from sentry_sdk.traces import StreamedSpan
+from sentry_sdk.traces import Span
 from sentry_sdk.tracing_utils import (
     add_query_source,
     record_sql_queries,
@@ -105,11 +105,11 @@ async def _inner(*args: Any, **kwargs: Any) -> T:
             if conn:
                 _set_db_data(span, conn)
             res = await f(*args, **kwargs)
-            if isinstance(span, StreamedSpan):
+            if isinstance(span, Span):
                 with capture_internal_exceptions():
                     add_query_source(span)
 
-        if not isinstance(span, StreamedSpan):
+        if not isinstance(span, Span):
             with capture_internal_exceptions():
                 add_query_source(span)
 
@@ -158,11 +158,11 @@ async def _inner(*args: Any, **kwargs: Any) -> T:
                 if conn:
                     _set_db_data(span, conn)
                 res = await f(*args, **kwargs)
-                if isinstance(span, StreamedSpan):
+                if isinstance(span, Span):
                     with capture_internal_exceptions():
                         add_query_source(span)
 
-            if not isinstance(span, StreamedSpan):
+            if not isinstance(span, Span):
                 with capture_internal_exceptions():
                     add_query_source(span)
 

sentry_sdk/integrations/anthropic.py

@@ -15,7 +15,7 @@
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration, _check_minimum_version
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.traces import StreamedSpan
+from sentry_sdk.traces import Span
 from sentry_sdk.utils import (
     capture_internal_exceptions,
     event_from_exception,
@@ -83,7 +83,7 @@
     from sentry_sdk._types import TextPart
 
     class _PatchedRawMessageStream(Stream[RawMessageStreamEvent]):
-        _span: StreamedSpan
+        _span: Span
         _integration: "AnthropicIntegration"
 
         _model: Optional[ModelParam]
@@ -93,7 +93,7 @@ class _PatchedRawMessageStream(Stream[RawMessageStreamEvent]):
         _finish_reason: Optional[str]
 
     class _PatchedMessageStream(MessageStream):
-        _span: StreamedSpan
+        _span: Span
         _integration: "AnthropicIntegration"
 
         _model: Optional[ModelParam]
@@ -103,7 +103,7 @@ class _PatchedMessageStream(MessageStream):
         _finish_reason: Optional[str]
 
     class _PatchedRawAsyncMessageStream(AsyncStream[RawMessageStreamEvent]):
-        _span: StreamedSpan
+        _span: Span
         _integration: "AnthropicIntegration"
 
         _model: Optional[ModelParam]
@@ -113,7 +113,7 @@ class _PatchedRawAsyncMessageStream(AsyncStream[RawMessageStreamEvent]):
         _finish_reason: Optional[str]
 
     class _PatchedAsyncMessageStream(AsyncMessageStream):
-        _span: StreamedSpan
+        _span: Span
         _integration: "AnthropicIntegration"
 
         _model: Optional[ModelParam]
@@ -123,7 +123,7 @@ class _PatchedAsyncMessageStream(AsyncMessageStream):
         _finish_reason: Optional[str]
 
     class _PatchedMessageStreamManager(MessageStreamManager):
-        _span: StreamedSpan
+        _span: Span
         _integration: "AnthropicIntegration"
 
         _max_tokens: int
@@ -136,7 +136,7 @@ class _PatchedMessageStreamManager(MessageStreamManager):
         _tools: Optional[Iterable[ToolUnionParam]]
 
     class _PatchedAsyncMessageStreamManager(AsyncMessageStreamManager[Any]):
-        _span: StreamedSpan
+        _span: Span
         _integration: "AnthropicIntegration"
 
         _max_tokens: int
@@ -441,7 +441,7 @@ def _transform_system_instructions(
 
 
 def _set_common_input_data(
-    span: "StreamedSpan",
+    span: "Span",
     integration: "AnthropicIntegration",
     max_tokens: "int",
     messages: "Iterable[MessageParam]",
@@ -556,7 +556,7 @@ def _set_common_input_data(
 
 
 def _set_create_input_data(
-    span: "StreamedSpan",
+    span: "Span",
     kwargs: "dict[str, Any]",
     integration: "AnthropicIntegration",
 ) -> None:
@@ -640,7 +640,7 @@ async def _wrap_asynchronous_message_iterator(
 
 
 def _set_output_data(
-    span: "StreamedSpan",
+    span: "Span",
     integration: "AnthropicIntegration",
     model: "str | None",
     input_tokens: "int | None",
@@ -928,7 +928,7 @@ def _accumulate_event_data(
 
 
 def _set_streaming_output_data(
-    span: "StreamedSpan",
+    span: "Span",
     integration: "AnthropicIntegration",
     model: "Optional[str]",
     usage: "_RecordedUsage",

sentry_sdk/integrations/arq.py

@@ -180,7 +180,7 @@ async def _sentry_coroutine(
             return await coroutine(ctx, *args, **kwargs)
 
         scope = sentry_sdk.get_current_scope()
-        span = scope.streamed_span
+        span = scope.span
         if span is not None:
             span.name = name
 

sentry_sdk/integrations/asgi.py

@@ -33,7 +33,7 @@
 )
 from sentry_sdk.traces import (
     SegmentNameSource,
-    StreamedSpan,
+    Span,
 )
 from sentry_sdk.tracing import (
     SOURCE_FOR_STYLE,
@@ -218,7 +218,7 @@ async def _run_app(
 
                     method = scope.get("method", "").upper()
 
-                    span: "Optional[ContextManager[Optional[StreamedSpan]]]" = None
+                    span: "Optional[ContextManager[Optional[Span]]]" = None
                     attributes: "Attributes" = {
                         "sentry.segment.name.source": getattr(
                             transaction_source, "value", transaction_source

sentry_sdk/integrations/asyncpg.py

@@ -7,7 +7,7 @@
 import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration, _check_minimum_version
-from sentry_sdk.traces import StreamedSpan
+from sentry_sdk.traces import Span
 from sentry_sdk.tracing_utils import (
     add_query_source,
     record_sql_queries,
@@ -111,7 +111,7 @@ def _record(
     params_list: "tuple[Any, ...] | None",
     *,
     executemany: bool = False,
-) -> "Iterator[StreamedSpan]":
+) -> "Iterator[Span]":
     client = sentry_sdk.get_client()
     integration = client.get_integration(AsyncPGIntegration)
     if integration is not None and not integration._record_params:
@@ -231,7 +231,7 @@ async def _inner(*args: "Any", **kwargs: "Any") -> "T":
     return _inner
 
 
-def _set_db_data(span: "StreamedSpan", conn: "Any") -> None:
+def _set_db_data(span: "Span", conn: "Any") -> None:
     addr = conn._addr
     database = conn._params.database
     user = conn._params.user

sentry_sdk/integrations/boto3.py

@@ -4,7 +4,7 @@
 import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration, _check_minimum_version
-from sentry_sdk.traces import StreamedSpan
+from sentry_sdk.traces import Span
 from sentry_sdk.tracing import BAGGAGE_HEADER_NAME
 from sentry_sdk.tracing_utils import (
     add_http_breadcrumb,
@@ -78,7 +78,7 @@ def _sentry_request_created(
 
     breadcrumb: "dict[str, Any]" = {}
 
-    span: "Optional[StreamedSpan]" = None
+    span: "Optional[Span]" = None
 
     url_attributes = get_url_attributes(client, parsed_url)
     breadcrumb.update(url_attributes)
@@ -165,7 +165,7 @@ def _replace_header(request: "AWSRequest", key: str, value: str) -> None:
 def _sentry_after_call(
     context: "Dict[str, Any]", parsed: "Dict[str, Any]", **kwargs: "Any"
 ) -> None:
-    span: "Optional[StreamedSpan]" = context.pop("_sentrysdk_span", None)
+    span: "Optional[Span]" = context.pop("_sentrysdk_span", None)
 
     # Span could be absent if the integration is disabled.
     if span is None:
@@ -213,7 +213,7 @@ def sentry_streaming_body_close(*args: "Any", **kwargs: "Any") -> None:
 def _sentry_after_call_error(
     context: "Dict[str, Any]", exception: "Type[BaseException]", **kwargs: "Any"
 ) -> None:
-    span: "Optional[StreamedSpan]" = context.pop("_sentrysdk_span", None)
+    span: "Optional[Span]" = context.pop("_sentrysdk_span", None)
 
     # Span could be absent if the integration is disabled.
     if span is None: