diff --git a/sentry_sdk/integrations/opentelemetry/__init__.py b/sentry_sdk/integrations/opentelemetry/__init__.py index 5dbd23e3a7..e69de29bb2 100644 --- a/sentry_sdk/integrations/opentelemetry/__init__.py +++ b/sentry_sdk/integrations/opentelemetry/__init__.py @@ -1,5 +0,0 @@ -from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator - -__all__ = [ - "SentryPropagator", -] diff --git a/sentry_sdk/integrations/opentelemetry/integration.py b/sentry_sdk/integrations/opentelemetry/integration.py index 8b9130ca33..ef5bd34f96 100644 --- a/sentry_sdk/integrations/opentelemetry/integration.py +++ b/sentry_sdk/integrations/opentelemetry/integration.py @@ -5,8 +5,11 @@ """ from sentry_sdk.integrations import DidNotEnable, Integration -from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator -from sentry_sdk.opentelemetry import SentrySampler, SentrySpanProcessor +from sentry_sdk.opentelemetry import ( + SentryPropagator, + SentrySampler, + SentrySpanProcessor, +) from sentry_sdk.utils import logger try: diff --git a/sentry_sdk/opentelemetry/__init__.py b/sentry_sdk/opentelemetry/__init__.py index b8d1b0a44f..2d057016c1 100644 --- a/sentry_sdk/opentelemetry/__init__.py +++ b/sentry_sdk/opentelemetry/__init__.py @@ -1,7 +1,9 @@ +from sentry_sdk.opentelemetry.propagator import SentryPropagator from sentry_sdk.opentelemetry.sampler import SentrySampler from sentry_sdk.opentelemetry.span_processor import SentrySpanProcessor __all__ = [ + "SentryPropagator", "SentrySampler", "SentrySpanProcessor", ] diff --git a/sentry_sdk/integrations/opentelemetry/propagator.py b/sentry_sdk/opentelemetry/propagator.py similarity index 100% rename from sentry_sdk/integrations/opentelemetry/propagator.py rename to sentry_sdk/opentelemetry/propagator.py diff --git a/setup.py b/setup.py index 5f5242d838..04bcbe2122 100644 --- a/setup.py +++ b/setup.py @@ -86,7 +86,7 @@ def get_file_text(file_name): }, entry_points={ "opentelemetry_propagator": [ - "sentry=sentry_sdk.integrations.opentelemetry:SentryPropagator" + "sentry=sentry_sdk.opentelemetry:SentryPropagator" ] }, classifiers=[ diff --git a/tests/integrations/opentelemetry/test_entry_points.py b/tests/integrations/opentelemetry/test_entry_points.py index cd78209432..efadb67a06 100644 --- a/tests/integrations/opentelemetry/test_entry_points.py +++ b/tests/integrations/opentelemetry/test_entry_points.py @@ -3,7 +3,7 @@ from unittest.mock import patch from opentelemetry import propagate -from sentry_sdk.integrations.opentelemetry import SentryPropagator +from sentry_sdk.opentelemetry import SentryPropagator def test_propagator_loaded_if_mentioned_in_environment_variable(): diff --git a/tests/integrations/opentelemetry/test_propagator.py b/tests/integrations/opentelemetry/test_propagator.py index b18e3bc400..f57679cc3e 100644 --- a/tests/integrations/opentelemetry/test_propagator.py +++ b/tests/integrations/opentelemetry/test_propagator.py @@ -10,7 +10,7 @@ SENTRY_BAGGAGE_KEY, SENTRY_TRACE_KEY, ) -from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator +from sentry_sdk.opentelemetry import SentryPropagator from tests.conftest import SortedBaggage