ref: Move propagator out of integrations/opentelemetry/

sentry_sdk/integrations/opentelemetry/__init__.py

@@ -1,5 +0,0 @@
-from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator
-
-__all__ = [
-    "SentryPropagator",
-]

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:

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",
 ]

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=[

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():

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