Merge branch 'master' into feat/span-first

Author: sentrivana

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
         token: ${{ steps.token.outputs.token }}
         fetch-depth: 0
     - name: Prepare release
-      uses: getsentry/craft@d4cfac9d25d1fc72c9241e5d22aff559a114e4e9 # v2
+      uses: getsentry/craft@013a7b2113c2cac0ff32d5180cfeaefc7c9ce5b6 # v2
       env:
         GITHUB_TOKEN: ${{ steps.token.outputs.token }}
       with:

scripts/populate_tox/package_dependencies.jsonl

@@ -531,12 +531,12 @@ def normalize_message_roles(messages: "list[dict[str, Any]]") -> "list[dict[str,
 
 
 def get_start_span_function() -> "Callable[..., Any]":
-    client = sentry_sdk.get_client()
+    if has_span_streaming_enabled(sentry_sdk.get_client().options):
+        return sentry_sdk.traces.start_span
 
     current_span = sentry_sdk.get_current_span()
-    if isinstance(current_span, StreamedSpan) or has_span_streaming_enabled(
-        client.options
-    ):
+    if isinstance(current_span, StreamedSpan):
+        # mypy
         return sentry_sdk.traces.start_span
 
     transaction_exists = (

scripts/populate_tox/releases.jsonl

@@ -6,8 +6,8 @@
 from sentry_sdk._init_implementation import init
 from sentry_sdk.consts import INSTRUMENTER
 from sentry_sdk.scope import Scope, _ScopeManager, new_scope, isolation_scope
-from sentry_sdk.tracing import NoOpSpan, Transaction, trace
 from sentry_sdk.traces import StreamedSpan
+from sentry_sdk.tracing import NoOpSpan, Transaction, trace
 from sentry_sdk.crons import monitor
 
 from typing import TYPE_CHECKING
@@ -38,6 +38,7 @@
         LogLevelStr,
         SamplingContext,
     )
+    from sentry_sdk.traces import StreamedSpan
     from sentry_sdk.tracing import Span, TransactionKwargs
 
     T = TypeVar("T")