diff --git a/sentry_sdk/_init_implementation.py b/sentry_sdk/_init_implementation.py index 51bcc9029c..34e9d071e9 100644 --- a/sentry_sdk/_init_implementation.py +++ b/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 diff --git a/sentry_sdk/api.py b/sentry_sdk/api.py index 0555244a7c..2ded31ee48 100644 --- a/sentry_sdk/api.py +++ b/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, diff --git a/sentry_sdk/opentelemetry/contextvars_context.py b/sentry_sdk/opentelemetry/contextvars_context.py index 66d59b4ae1..51d450af82 100644 --- a/sentry_sdk/opentelemetry/contextvars_context.py +++ b/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): diff --git a/sentry_sdk/opentelemetry/propagator.py b/sentry_sdk/opentelemetry/propagator.py index 2a9ad70434..6062e5643a 100644 --- a/sentry_sdk/opentelemetry/propagator.py +++ b/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): diff --git a/sentry_sdk/integrations/opentelemetry/scope.py b/sentry_sdk/opentelemetry/scope.py similarity index 100% rename from sentry_sdk/integrations/opentelemetry/scope.py rename to sentry_sdk/opentelemetry/scope.py diff --git a/setup.py b/setup.py index ecbb3e2f54..d55915e42a 100644 --- a/setup.py +++ b/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", diff --git a/tests/conftest.py b/tests/conftest.py index 3fdbab5e54..5987265e32 100644 --- a/tests/conftest.py +++ b/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, ) diff --git a/tests/test_scope.py b/tests/test_scope.py index c5a2d9380e..507e76046c 100644 --- a/tests/test_scope.py +++ b/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,