Skip to content

fix: distributed propagation #86

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

Merged
vabruzzo merged 1 commit into from
Jun 20, 2025
Merged

fix: distributed propagation #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions dreadnode/tracing/span.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from opentelemetry import trace as trace_api
from opentelemetry.sdk.trace import ReadableSpan
from opentelemetry.trace import Tracer
from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
from opentelemetry.util import types as otel_types
from ulid import ULID

Expand Down Expand Up @@ -358,8 +359,23 @@ def __enter__(self) -> te.Self:
raise RuntimeError("You cannot start a run span within another run")

if self._remote_context is not None:
otel_context = propagate.extract(carrier=self._remote_context)
self._remote_token = context_api.attach(otel_context)
# If the global propagator is a NoExtract instance, we can't continue
# a trace, so we'll bypass it and use the W3C propagator directly.
global_propagator = propagate.get_global_textmap()
if "NoExtract" in type(global_propagator).__name__:
w3c_propagator = TraceContextTextMapPropagator()
Copy link
Copy Markdown
Contributor Author

@vabruzzo vabruzzo Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think we can just always use this globally rather than switching it out here

otel_context = w3c_propagator.extract(carrier=self._remote_context)
else:
otel_context = propagate.extract(carrier=self._remote_context)

span_context = trace_api.get_current_span(otel_context).get_span_context()

# If we have a valid trace_id, we can attach the context and continue the trace.
if span_context.trace_id != 0:
self._remote_token = context_api.attach(otel_context)
else:
# Fall back to creating a new span if the context is invalid.
super().__enter__()
else:
super().__enter__()

Expand Down
Loading