ref: Don't auto-promote child spans to segments in integrations in span streaming by sentrivana · Pull Request #6807 · getsentry/sentry-python

sentrivana · 2026-07-13T13:19:47Z

Description

Issues

Reminders

Please add tests to validate your changes, and lint your code using uv run ruff.
Add GH Issue ID & Linear ID (if applicable)
PR title should use conventional commit style (feat:, fix:, ref:, meta:)
For external contributors: CONTRIBUTING.md, Sentry SDK development docs, Discord community

Move nullcontext from _wsgi_common to utils so it can be imported without pulling in WSGI-specific code. Update all consumers. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

…ent span In span streaming mode, sentry_sdk.traces.start_span() without parent_span=None creates a new root segment when there's no current span. For integrations that create child spans (not root/transaction spans), this is wrong — they should do nothing instead. Add get_current_span() checks to all streaming-path child span creation across 52 integration files. Root span creators (those with parent_span=None in the non-streaming path) are left untouched. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Replace nullcontext + if-span-is-not-None patterns with early returns when the with block ends with a return. This removes unnecessary nesting and nullcontext imports from 23 files. The only remaining nullcontext usage is in pyreqwest.py where the function is a generator context manager that must yield. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

sentrivana · 2026-07-13T14:06:28Z

Split up into multiple smaller PRs

sentry-warden · 2026-07-13T14:13:18Z

+        span = None
+        if sentry_sdk.traces.get_current_span() is not None:
+            span = sentry_sdk.traces.start_span(
+                name=f"{agent.name} workflow",
+                attributes={"sentry.origin": SPAN_ORIGIN},
+            )

        return span


agent_workflow_span can now return None, crashing both callers

When span streaming is enabled and there is no current span, this returns None, but callers do with agent_workflow_span(...) and workflow_span.__enter__() which raise AttributeError on None.

Evidence

New code sets span = None and only assigns a real span when get_current_span() is not None, then return span.

runner.py:45 uses with agent_workflow_span(agent) as workflow_span:; entering a with None invokes None.__enter__() raising AttributeError.

runner.py:156-157 does workflow_span = agent_workflow_span(agent) then workflow_span.__enter__(), dereferencing None.

The return type annotation is Union[Span, StreamedSpan] and does not include None, so callers do not guard for it.

Also found at 5 additional locations

sentry_sdk/integrations/pydantic_ai/spans/ai_client.py:284-294

sentry_sdk/integrations/pydantic_ai/spans/execute_tool.py:72

sentry_sdk/integrations/pydantic_ai/spans/invoke_agent.py:54-62

sentry_sdk/integrations/openai_agents/spans/invoke_agent.py:104

sentry_sdk/integrations/openai_agents/spans/ai_client.py:58

_{Identified by Warden code-review · BB3-UMW}

sentry-warden · 2026-07-13T14:13:18Z

+            if sentry_sdk.traces.get_current_span() is None:
+                return await real_send(self, request, **kwargs)
+


Outgoing requests skip trace propagation when no current span exists

When span streaming is enabled and there is no current span, the early return await real_send(...) bypasses should_propagate_trace/header injection, so outgoing requests won't carry trace propagation headers — was this intended?

Evidence

The new guard returns real_send(self, request, **kwargs) before entering the with sentry_sdk.traces.start_span(...) block.

Trace propagation (should_propagate_trace, iter_trace_propagation_headers, baggage/header injection) only runs inside that block (lines ~200+).

The non-streaming else branch still injects propagation headers unconditionally, so behavior now diverges when no parent span is active.

_{Identified by Warden code-review · RW3-RUU}

sentry-warden · 2026-07-13T14:13:24Z

@@ -49,8 +51,9 @@ def ai_client_span(
        # TODO-anton: remove hardcoded stuff and replace something that also works for embedding and so on
        span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "chat")

-    _set_agent_data(span, agent)
-    _set_input_data(span, get_response_kwargs)
+    if span is not None:
+        _set_agent_data(span, agent)
+        _set_input_data(span, get_response_kwargs)

    return span


ai_client_span can return None, breaking the with statement in callers

When span streaming is enabled but there is no current span, ai_client_span returns None, which is then used as with ai_client_span(...) as span: in patches/models.py and raises AttributeError: __enter__.

Evidence

The new branch sets span = None and only assigns a real span when sentry_sdk.traces.get_current_span() is not None, so ai_client_span now returns None in the streaming-no-parent case.

patches/models.py:115 (with ai_client_span(agent, kwargs) as span:) and patches/models.py:154 (with ai_client_span(agent, span_kwargs) as span:) consume the return value directly as a context manager, with no None guard.

with None as span: invokes None.__enter__, raising AttributeError, so the wrapped get_response/stream_response call is aborted before the original model call runs.

The subsequent span.set_attribute/span.set_data in the streaming wrapper (models.py:158-166) would also fail on None, but the with statement fails first.

Also found at 4 additional locations

sentry_sdk/integrations/pydantic_ai/spans/ai_client.py:286-319

sentry_sdk/integrations/pydantic_ai/spans/invoke_agent.py:54-54

sentry_sdk/integrations/openai_agents/spans/agent_workflow.py:21-28

sentry_sdk/integrations/openai_agents/spans/execute_tool.py:22-35

_{Identified by Warden find-bugs · 786-YEA}

sentry-warden · 2026-07-13T14:13:24Z

+            if sentry_sdk.traces.get_current_span() is None:
+                return real_putrequest(self, method, url, *args, **kwargs)


Early return skips outgoing trace propagation headers when no current streamed span

In span-streaming mode, when there is no current span the patched putrequest returns before reaching the should_propagate_trace block, so outgoing HTTP requests no longer get sentry-trace/baggage headers, breaking distributed trace propagation for requests made outside an active streamed span.

Evidence

The new if sentry_sdk.traces.get_current_span() is None: return real_putrequest(...) at stdlib.py:117-118 returns before the trace-propagation block that calls iter_trace_propagation_headers and self.putheader(key, value) when should_propagate_trace(client, real_url) is true.

scope.iter_trace_propagation_headers (scope.py:680) falls back to get_active_propagation_context().iter_headers() when no span is passed, so headers would still be produced from the scope's propagation context — the early return discards them.

The grpc client integration (grpc/client.py:36-40) handles the same get_current_span() is None case differently: it still calls _update_client_call_details_metadata_from_scope to inject propagation metadata before returning, showing propagation is intended even without a streamed span.

The non-streaming branch always creates a span and always reaches the propagation block, so distributed tracing continues there — the streaming path is the one that loses propagation.

Also found at 2 additional locations

sentry_sdk/integrations/httpx2.py:176-178

sentry_sdk/integrations/httpx.py:176-178

_{Identified by Warden find-bugs · KKL-B67}

sentrivana and others added 5 commits July 13, 2026 14:47

ref: Move nullcontext to sentry_sdk.utils

d4cedbc

Move nullcontext from _wsgi_common to utils so it can be imported without pulling in WSGI-specific code. Update all consumers. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

ref: Revert unnecessary span variable rename in celery

8f75526

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Merge branch 'master' into ivana/keep-child-span-child-spans

7d9d279

sentrivana closed this Jul 13, 2026

sentry-warden Bot reviewed Jul 13, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

ref: Don't auto-promote child spans to segments in integrations in span streaming#6807

ref: Don't auto-promote child spans to segments in integrations in span streaming#6807
sentrivana wants to merge 5 commits into
masterfrom
ivana/keep-child-span-child-spans

sentrivana commented Jul 13, 2026

Uh oh!

sentrivana commented Jul 13, 2026

Uh oh!

sentry-warden Bot Jul 13, 2026

Uh oh!

sentry-warden Bot Jul 13, 2026

Uh oh!

sentry-warden Bot Jul 13, 2026

Uh oh!

sentry-warden Bot Jul 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

		if sentry_sdk.traces.get_current_span() is None:
		return await real_send(self, request, **kwargs)

		if sentry_sdk.traces.get_current_span() is None:
		return real_putrequest(self, method, url, args, *kwargs)

Uh oh!

Conversation

sentrivana commented Jul 13, 2026

Description

Issues

Reminders

Uh oh!

sentrivana commented Jul 13, 2026

Uh oh!

sentry-warden Bot Jul 13, 2026

Choose a reason for hiding this comment

Uh oh!

sentry-warden Bot Jul 13, 2026

Choose a reason for hiding this comment

Uh oh!

sentry-warden Bot Jul 13, 2026

Choose a reason for hiding this comment

Uh oh!

sentry-warden Bot Jul 13, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant