Use POTel use_scope, use_isolation_scope (#3522)

* use potelscope

* Use POTel use_{isolation_}scope

* use from top level api

Author: sentrivana

sentry_sdk/api.py

@@ -11,6 +11,8 @@
     PotelScope as Scope,
     new_scope,
     isolation_scope,
+    use_scope,
+    use_isolation_scope,
 )
 
 
@@ -77,6 +79,8 @@
     "start_transaction",
     "trace",
     "monitor",
+    "use_scope",
+    "use_isolation_scope",
 ]
 
 

sentry_sdk/integrations/threading.py

@@ -4,7 +4,6 @@
 
 import sentry_sdk
 from sentry_sdk.integrations import Integration
-from sentry_sdk.scope import use_isolation_scope, use_scope
 from sentry_sdk.utils import (
     ensure_integration_enabled,
     event_from_exception,
@@ -95,8 +94,8 @@ def _run_old_run_func():
                 reraise(*_capture_exception())
 
         if isolation_scope_to_use is not None and current_scope_to_use is not None:
-            with use_isolation_scope(isolation_scope_to_use):
-                with use_scope(current_scope_to_use):
+            with sentry_sdk.use_isolation_scope(isolation_scope_to_use):
+                with sentry_sdk.use_scope(current_scope_to_use):
                     return _run_old_run_func()
         else:
             return _run_old_run_func()

sentry_sdk/integrations/wsgi.py

@@ -7,7 +7,6 @@
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.integrations._wsgi_common import _filter_headers
 from sentry_sdk.sessions import track_session
-from sentry_sdk.scope import use_isolation_scope
 from sentry_sdk.tracing import Transaction, TRANSACTION_SOURCE_ROUTE
 from sentry_sdk.utils import (
     ContextVar,
@@ -219,7 +218,7 @@ def __iter__(self):
         iterator = iter(self._response)
 
         while True:
-            with use_isolation_scope(self._scope):
+            with sentry_sdk.use_isolation_scope(self._scope):
                 try:
                     chunk = next(iterator)
                 except StopIteration:
@@ -231,7 +230,7 @@ def __iter__(self):
 
     def close(self):
         # type: () -> None
-        with use_isolation_scope(self._scope):
+        with sentry_sdk.use_isolation_scope(self._scope):
             try:
                 self._response.close()  # type: ignore
             except AttributeError: