ref: Move otel scope out of integrations/opentelemetry/

sentry_sdk/_init_implementation.py

@@ -2,7 +2,7 @@
 
 import sentry_sdk
 from sentry_sdk.consts import ClientConstructor
-from sentry_sdk.integrations.opentelemetry.scope import setup_scope_context_management
+from sentry_sdk.opentelemetry.scope import setup_scope_context_management
 
 if TYPE_CHECKING:
     from typing import Any, Optional

sentry_sdk/api.py

@@ -8,7 +8,7 @@
 
 # TODO-neel-potel make 2 scope strategies/impls and switch
 from sentry_sdk.scope import Scope as BaseScope
-from sentry_sdk.integrations.opentelemetry.scope import (
+from sentry_sdk.opentelemetry.scope import (
     PotelScope as Scope,
     new_scope,
     isolation_scope,

sentry_sdk/opentelemetry/contextvars_context.py

@@ -15,7 +15,7 @@
 if TYPE_CHECKING:
     from typing import Optional
     from contextvars import Token
-    import sentry_sdk.integrations.opentelemetry.scope as scope
+    import sentry_sdk.opentelemetry.scope as scope
 
 
 class SentryContextVarsRuntimeContext(ContextVarsRuntimeContext):

sentry_sdk/opentelemetry/propagator.py

@@ -36,7 +36,7 @@
 
 if TYPE_CHECKING:
     from typing import Optional, Set
-    import sentry_sdk.integrations.opentelemetry.scope as scope
+    import sentry_sdk.opentelemetry.scope as scope
 
 
 class SentryPropagator(TextMapPropagator):

setup.py

@@ -85,7 +85,9 @@ def get_file_text(file_name):
         "unleash": ["UnleashClient>=6.0.1"],
     },
     entry_points={
-        "opentelemetry_propagator": ["sentry=sentry_sdk.opentelemetry:SentryPropagator"]
+        "opentelemetry_propagator": [
+            "sentry=sentry_sdk.opentelemetry:SentryPropagator"
+        ],
     },
     classifiers=[
         "Development Status :: 5 - Production/Stable",

tests/conftest.py

@@ -63,7 +63,7 @@ def benchmark():
 
 
 from sentry_sdk import scope
-from sentry_sdk.integrations.opentelemetry.scope import (
+from sentry_sdk.opentelemetry.scope import (
     setup_scope_context_management,
     setup_initial_scopes,
 )

tests/test_scope.py

@@ -15,7 +15,7 @@
     ScopeType,
     should_send_default_pii,
 )
-from sentry_sdk.integrations.opentelemetry.scope import (
+from sentry_sdk.opentelemetry.scope import (
     PotelScope as Scope,
     use_scope,
     use_isolation_scope,