Remove OpenTelemetryIntegration from __init__.py (#2379)

sentrivana · web-flow · commit a07c4ae9c61f · 2023-09-18T11:36:43.000+02:00
Always importing the experimental integration module that requires a higher version of the opentelemetry-distro package causes packaging issues on some systems where the newer OTel packages don't exist.
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
@@ -243,7 +243,7 @@ def _capture_envelope(envelope):
                 )
                 self.options["instrumenter"] = INSTRUMENTER.OTEL
                 _DEFAULT_INTEGRATIONS.append(
-                    "sentry_sdk.integrations.opentelemetry.OpenTelemetryIntegration",
+                    "sentry_sdk.integrations.opentelemetry.integration.OpenTelemetryIntegration",
                 )
 
             self.integrations = setup_integrations(
diff --git a/sentry_sdk/integrations/opentelemetry/__init__.py b/sentry_sdk/integrations/opentelemetry/__init__.py
@@ -1,7 +1,3 @@
-from sentry_sdk.integrations.opentelemetry.integration import (  # noqa: F401
-    OpenTelemetryIntegration,
-)
-
 from sentry_sdk.integrations.opentelemetry.span_processor import (  # noqa: F401
     SentrySpanProcessor,
 )

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ def _capture_envelope(envelope):`
`243`	`243`	`)`
`244`	`244`	`self.options["instrumenter"] = INSTRUMENTER.OTEL`
`245`	`245`	`_DEFAULT_INTEGRATIONS.append(`
`246`		`- "sentry_sdk.integrations.opentelemetry.OpenTelemetryIntegration",`
	`246`	`+ "sentry_sdk.integrations.opentelemetry.integration.OpenTelemetryIntegration",`
`247`	`247`	`)`
`248`	`248`
`249`	`249`	`self.integrations = setup_integrations(`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,3 @@`
`1`		`-from sentry_sdk.integrations.opentelemetry.integration import ( # noqa: F401`
`2`		`- OpenTelemetryIntegration,`
`3`		`-)`
`4`		`-`
`5`	`1`	`from sentry_sdk.integrations.opentelemetry.span_processor import ( # noqa: F401`
`6`	`2`	`SentrySpanProcessor,`
`7`	`3`	`)`