From 81c87cb9fefba50703f3f960dfc346be3d8c3c7e Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Thu, 19 Jan 2023 14:10:58 +0100 Subject: [PATCH 1/4] Make sure to noop when there is no DSN --- sentry_sdk/integrations/opentelemetry/span_processor.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sentry_sdk/integrations/opentelemetry/span_processor.py b/sentry_sdk/integrations/opentelemetry/span_processor.py index 5b80efbca5..bcce71f3ee 100644 --- a/sentry_sdk/integrations/opentelemetry/span_processor.py +++ b/sentry_sdk/integrations/opentelemetry/span_processor.py @@ -98,6 +98,9 @@ def on_start(self, otel_span, parent_context=None): if not hub: return + if not hub.client.dsn: + return + if hub.client and hub.client.options["instrumenter"] != INSTRUMENTER.OTEL: return From 8f22349a349e01da17ce0629eca216c0ecfb78a7 Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Thu, 19 Jan 2023 14:18:44 +0100 Subject: [PATCH 2/4] Better condition --- sentry_sdk/integrations/opentelemetry/span_processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry_sdk/integrations/opentelemetry/span_processor.py b/sentry_sdk/integrations/opentelemetry/span_processor.py index bcce71f3ee..fe572c7a04 100644 --- a/sentry_sdk/integrations/opentelemetry/span_processor.py +++ b/sentry_sdk/integrations/opentelemetry/span_processor.py @@ -98,7 +98,7 @@ def on_start(self, otel_span, parent_context=None): if not hub: return - if not hub.client.dsn: + if not hub.client or (hub.client and not hub.client.dsn): return if hub.client and hub.client.options["instrumenter"] != INSTRUMENTER.OTEL: From 99712d530c131a62e1952860f0e2c2d6a053918c Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 20 Jan 2023 09:42:36 +0100 Subject: [PATCH 3/4] Check for invalid dsn. --- sentry_sdk/integrations/opentelemetry/span_processor.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sentry_sdk/integrations/opentelemetry/span_processor.py b/sentry_sdk/integrations/opentelemetry/span_processor.py index 4388305fc4..1415fabacb 100644 --- a/sentry_sdk/integrations/opentelemetry/span_processor.py +++ b/sentry_sdk/integrations/opentelemetry/span_processor.py @@ -101,6 +101,11 @@ def on_start(self, otel_span, parent_context=None): if not hub.client or (hub.client and not hub.client.dsn): return + try: + _ = Dsn(hub.client.dsn) + except Exception: + return + if hub.client and hub.client.options["instrumenter"] != INSTRUMENTER.OTEL: return From 21c66a263a42c231ae2534a939f4621802048e42 Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 20 Jan 2023 09:57:31 +0100 Subject: [PATCH 4/4] Fixed typing --- sentry_sdk/integrations/opentelemetry/span_processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry_sdk/integrations/opentelemetry/span_processor.py b/sentry_sdk/integrations/opentelemetry/span_processor.py index 1415fabacb..0017708a97 100644 --- a/sentry_sdk/integrations/opentelemetry/span_processor.py +++ b/sentry_sdk/integrations/opentelemetry/span_processor.py @@ -102,7 +102,7 @@ def on_start(self, otel_span, parent_context=None): return try: - _ = Dsn(hub.client.dsn) + _ = Dsn(hub.client.dsn or "") except Exception: return