From 80f913652d4f8dc093fa753af838cf71f6165ec9 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Wed, 18 Jan 2023 12:47:32 +0100 Subject: [PATCH 1/2] fix(opentelemetry): Use dict for sentry-trace context instead of tuple --- sentry_sdk/integrations/opentelemetry/span_processor.py | 2 +- tests/integrations/opentelemetry/test_span_processor.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sentry_sdk/integrations/opentelemetry/span_processor.py b/sentry_sdk/integrations/opentelemetry/span_processor.py index 5b80efbca5..0dc7caaf2d 100644 --- a/sentry_sdk/integrations/opentelemetry/span_processor.py +++ b/sentry_sdk/integrations/opentelemetry/span_processor.py @@ -217,7 +217,7 @@ def _get_trace_data(self, otel_span, parent_context): sentry_trace_data = get_value(SENTRY_TRACE_KEY, parent_context) trace_data["parent_sampled"] = ( - sentry_trace_data[2] if sentry_trace_data else None + sentry_trace_data["parent_sampled"] if sentry_trace_data else None ) baggage = get_value(SENTRY_BAGGAGE_KEY, parent_context) diff --git a/tests/integrations/opentelemetry/test_span_processor.py b/tests/integrations/opentelemetry/test_span_processor.py index 7ba6f59e6c..7d0c81c5b3 100644 --- a/tests/integrations/opentelemetry/test_span_processor.py +++ b/tests/integrations/opentelemetry/test_span_processor.py @@ -9,6 +9,7 @@ from sentry_sdk.tracing import Span, Transaction from opentelemetry.trace import SpanKind, SpanContext +from sentry_sdk.tracing_utils import extract_sentrytrace_data def test_is_sentry_span(): @@ -103,7 +104,9 @@ def test_get_trace_data_with_sentry_trace(): with mock.patch( "sentry_sdk.integrations.opentelemetry.span_processor.get_value", side_effect=[ - ("1234567890abcdef1234567890abcdef", "1234567890abcdef", True), + extract_sentrytrace_data( + "1234567890abcdef1234567890abcdef-1234567890abcdef-1" + ), None, ], ): From 2bbfeb8bcae65650eb19796b65eaabfb2ab9bc52 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Wed, 18 Jan 2023 13:07:00 +0100 Subject: [PATCH 2/2] adjust other tests --- tests/integrations/opentelemetry/test_span_processor.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/integrations/opentelemetry/test_span_processor.py b/tests/integrations/opentelemetry/test_span_processor.py index 7d0c81c5b3..d7dc6b66df 100644 --- a/tests/integrations/opentelemetry/test_span_processor.py +++ b/tests/integrations/opentelemetry/test_span_processor.py @@ -121,7 +121,9 @@ def test_get_trace_data_with_sentry_trace(): with mock.patch( "sentry_sdk.integrations.opentelemetry.span_processor.get_value", side_effect=[ - ("1234567890abcdef1234567890abcdef", "1234567890abcdef", False), + extract_sentrytrace_data( + "1234567890abcdef1234567890abcdef-1234567890abcdef-0" + ), None, ], ): @@ -153,7 +155,9 @@ def test_get_trace_data_with_sentry_trace_and_baggage(): with mock.patch( "sentry_sdk.integrations.opentelemetry.span_processor.get_value", side_effect=[ - ("1234567890abcdef1234567890abcdef", "1234567890abcdef", True), + extract_sentrytrace_data( + "1234567890abcdef1234567890abcdef-1234567890abcdef-1" + ), baggage, ], ):