inline all the things

Author: ericapisani

sentry_sdk/integrations/fastapi.py

@@ -6,7 +6,7 @@
 import sentry_sdk
 from sentry_sdk.integrations import DidNotEnable
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.traces import _is_streamed_span
+from sentry_sdk.traces import StreamedSpan
 from sentry_sdk.tracing import SOURCE_FOR_STYLE, TransactionSource
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.utils import transaction_from_function
@@ -95,7 +95,7 @@ def _sentry_call(*args: "Any", **kwargs: "Any") -> "Any":
                 if has_span_streaming_enabled(client.options):
                     current_span = current_scope.streamed_span
 
-                    if _is_streamed_span(current_span):
+                    if type(current_span) is StreamedSpan:
                         segment = current_span._segment
                         segment._update_active_thread()
 

sentry_sdk/integrations/starlette.py

@@ -22,7 +22,8 @@
 )
 from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.traces import _get_current_streamed_span, _is_streamed_span
+from sentry_sdk.traces import _get_current_streamed_span
+from sentry_sdk.traces import StreamedSpan
 from sentry_sdk.tracing import (
     SOURCE_FOR_STYLE,
     TransactionSource,
@@ -255,7 +256,7 @@ def _set_request_body_data_on_streaming_segment(
     info: "Optional[Dict[str, Any]]",
 ) -> None:
     current_span = _get_current_streamed_span()
-    if info and "data" in info and _is_streamed_span(current_span):
+    if info and "data" in info and type(current_span) is StreamedSpan:
         with capture_internal_exceptions():
             current_span._segment.set_attribute(
                 "http.request.body.data",
@@ -552,7 +553,7 @@ def _sentry_sync_func(*args: "Any", **kwargs: "Any") -> "Any":
                 if span_streaming:
                     current_span = current_scope.streamed_span
 
-                    if _is_streamed_span(current_span):
+                    if type(current_span) is StreamedSpan:
                         current_span._segment._update_active_thread()
                 elif current_scope.transaction is not None:
                     current_scope.transaction.update_active_thread()

sentry_sdk/scope.py

@@ -31,7 +31,6 @@
     _DEFAULT_PARENT_SPAN,
     NoOpStreamedSpan,
     StreamedSpan,
-    _is_streamed_span,
 )
 from sentry_sdk.tracing import (
     BAGGAGE_HEADER_NAME,
@@ -588,7 +587,7 @@ def get_traceparent(self, *args: "Any", **kwargs: "Any") -> "Optional[str]":
 
         span_streaming = has_span_streaming_enabled(client.options)
         # If we have an active span, return traceparent from there
-        if span_streaming and _is_streamed_span(self.streamed_span):
+        if span_streaming and type(self.streamed_span) is StreamedSpan:
             return self.streamed_span._to_traceparent()
         elif not span_streaming and self.span is not None:
             return self.span._to_traceparent()
@@ -608,7 +607,7 @@ def get_baggage(self, *args: "Any", **kwargs: "Any") -> "Optional[Baggage]":
 
         span_streaming = has_span_streaming_enabled(client.options)
         # If we have an active span, return baggage from there
-        if span_streaming and _is_streamed_span(self.streamed_span):
+        if span_streaming and type(self.streamed_span) is StreamedSpan:
             return self.streamed_span._to_baggage()
         elif not span_streaming and self.span is not None:
             return self.span._to_baggage()
@@ -913,7 +912,7 @@ def streamed_span(self, span: "Optional[StreamedSpan]") -> None:
 
         # Also set _transaction and _transaction_info in streaming mode as this
         # is used for populating events and linking them to segments
-        if _is_streamed_span(span) and span._is_segment():
+        if type(span) is StreamedSpan and span._is_segment():
             self._transaction = span.name
             if span._attributes.get("sentry.span.source"):
                 self._transaction_info["source"] = str(

sentry_sdk/traces.py

@@ -37,7 +37,6 @@
         Iterator,
         Optional,
         ParamSpec,
-        TypeGuard,
         TypeVar,
         Union,
     )
@@ -767,11 +766,6 @@ def make_db_query(sql):
         return decorator
 
 
-def _is_streamed_span(span: "Any") -> "TypeGuard[StreamedSpan]":
-    """Returns True if span is a StreamedSpan (not a NoOpStreamedSpan)."""
-    return type(span) is StreamedSpan
-
-
 def _get_current_streamed_span(
     scope: "Optional[sentry_sdk.Scope]" = None,
 ) -> "Optional[StreamedSpan]":