Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(opentelemetry): Use dict for sentry-trace context instead of tuple #1847

Merged
merged 4 commits into from Jan 19, 2023
Merged

fix(opentelemetry): Use dict for sentry-trace context instead of tuple #1847

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80f9136
fix(opentelemetry): Use dict for sentry-trace context instead of tuple
AbhiPrasad Jan 18, 2023
2bbfeb8
adjust other tests
AbhiPrasad Jan 18, 2023
7fa5ead
Merge branch 'master' into abhi-sentry-trace-set
AbhiPrasad Jan 19, 2023
c165dd9
Merge branch 'master' into abhi-sentry-trace-set
antonpirker Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion sentry_sdk/integrations/opentelemetry/span_processor.py
View file
Open in desktop
Expand Up @@ -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)
Expand Down
13 changes: 10 additions & 3 deletions tests/integrations/opentelemetry/test_span_processor.py
View file
Open in desktop
Expand Up @@ -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():
Expand Down Expand Up @@ -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,
],
):
Expand All @@ -118,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,
],
):
Expand Down Expand Up @@ -150,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,
],
):
Expand Down