Merge branch 'master' into feat/span-first

Author: sentrivana

.github/workflows/ci.yml

@@ -5,7 +5,6 @@ on:
     branches:
       - master
       - release/**
-      - potel-base
 
   pull_request:
 

.github/workflows/codeql-analysis.yml

@@ -15,7 +15,6 @@ on:
   push:
     branches:
       - master
-      - potel-base
   pull_request:
   schedule:
     - cron: '18 18 * * 3'

.github/workflows/enforce-license-compliance.yml

@@ -6,7 +6,6 @@ on:
       - master
       - main
       - release/*
-      - potel-base
   pull_request:
 
 # Cancel in progress workflows on pull_requests.

sentry_sdk/tracing_utils.py

@@ -1052,7 +1052,6 @@ def create_streaming_span_decorator(
     """
     Create a span creating decorator that can wrap both sync and async functions.
     """
-    from sentry_sdk.scope import should_send_default_pii
 
     def span_decorator(f: "Any") -> "Any":
         """
@@ -1619,9 +1618,11 @@ def _matches(rule: "Any", value: "Any") -> bool:
     SENTRY_TRACE_HEADER_NAME,
     Span,
 )
+from sentry_sdk.traces import (
+    start_span as start_streaming_span,
+)
 
 from sentry_sdk.traces import (
     LOW_QUALITY_SEGMENT_SOURCES,
-    start_span as start_streaming_span,
     StreamedSpan,
 )