Skip to content

Commit 1ac27c8

Browse files
authored
fix(opentelemetry): Use dict for sentry-trace context instead of tuple (#1847)
* fix(opentelemetry): Use dict for sentry-trace context instead of tuple
1 parent 504188c commit 1ac27c8

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

sentry_sdk/integrations/opentelemetry/span_processor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ def _get_trace_data(self, otel_span, parent_context):
217217

218218
sentry_trace_data = get_value(SENTRY_TRACE_KEY, parent_context)
219219
trace_data["parent_sampled"] = (
220-
sentry_trace_data[2] if sentry_trace_data else None
220+
sentry_trace_data["parent_sampled"] if sentry_trace_data else None
221221
)
222222

223223
baggage = get_value(SENTRY_BAGGAGE_KEY, parent_context)

tests/integrations/opentelemetry/test_span_processor.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from sentry_sdk.tracing import Span, Transaction
1010

1111
from opentelemetry.trace import SpanKind, SpanContext
12+
from sentry_sdk.tracing_utils import extract_sentrytrace_data
1213

1314

1415
def test_is_sentry_span():
@@ -103,7 +104,9 @@ def test_get_trace_data_with_sentry_trace():
103104
with mock.patch(
104105
"sentry_sdk.integrations.opentelemetry.span_processor.get_value",
105106
side_effect=[
106-
("1234567890abcdef1234567890abcdef", "1234567890abcdef", True),
107+
extract_sentrytrace_data(
108+
"1234567890abcdef1234567890abcdef-1234567890abcdef-1"
109+
),
107110
None,
108111
],
109112
):
@@ -118,7 +121,9 @@ def test_get_trace_data_with_sentry_trace():
118121
with mock.patch(
119122
"sentry_sdk.integrations.opentelemetry.span_processor.get_value",
120123
side_effect=[
121-
("1234567890abcdef1234567890abcdef", "1234567890abcdef", False),
124+
extract_sentrytrace_data(
125+
"1234567890abcdef1234567890abcdef-1234567890abcdef-0"
126+
),
122127
None,
123128
],
124129
):
@@ -150,7 +155,9 @@ def test_get_trace_data_with_sentry_trace_and_baggage():
150155
with mock.patch(
151156
"sentry_sdk.integrations.opentelemetry.span_processor.get_value",
152157
side_effect=[
153-
("1234567890abcdef1234567890abcdef", "1234567890abcdef", True),
158+
extract_sentrytrace_data(
159+
"1234567890abcdef1234567890abcdef-1234567890abcdef-1"
160+
),
154161
baggage,
155162
],
156163
):

0 commit comments

Comments
 (0)