fix(tracing): Skip child span creation in streaming path when no current span (task queues) - #6814
Merged
sl0thentr0py merged 3 commits intoJul 16, 2026
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
…ent span (task queues) When span streaming is enabled and there is no current span, task queue integrations should not create new root segments for child-span operations. This adds a guard check using `sentry_sdk.traces.get_current_span()` before creating spans in the streaming path. Affected integrations: celery, huey, arq, ray. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Copy link
Copy Markdown
Contributor
Codecov Results 📊✅ 91185 passed | ⏭️ 6302 skipped | Total: 97487 | Pass Rate: 93.54% | Execution Time: 312m 32s 📊 Comparison with Base Branch
✨ No test changes detected All tests are passing successfully. ❌ Patch coverage is 50.00%. Project has 2446 uncovered lines.
@@ Coverage Diff @@
## main #PR +/-##
==========================================
- Coverage 89.80% 89.77% -0.03%
==========================================
Files 193 193 —
Lines 23898 23914 +16
Branches 8258 8268 +10
==========================================
+ Hits 21461 21468 +7
- Misses 2437 2446 +9
- Partials 1353 1356 +3Generated by Codecov Action |
Sorry, something went wrong.
When span streaming is enabled and enqueue is called without a wrapping span, the producer (queue.submit.huey) span is intentionally not created (early return in patch_enqueue). Update the streaming test expectations: - Single-task tests (transaction/segment, cancel, lock) now assert only the consumer segment is emitted. - Retry test accounts for the initial enqueue producing no span while the re-enqueue (inside the running consumer segment) still gets a child span. - Group and chord tests wrap enqueue in an active span, reflecting real usage, so the full producer tree is created and parented under it.
The retry re-enqueue happens without an active span, so no producer (queue.submit.arq) span is created for it. Adjust the positional span assertions in test_job_retry and test_span_origin_consumer to account for the suppressed producer span.
ericapisani
marked this pull request as ready for review
July 15, 2026 17:07
sl0thentr0py
approved these changes
Jul 16, 2026
6 tasks
mgaligniana
pushed a commit
to mgaligniana/sentry-python
that referenced
this pull request
Aug 9, 2026
…ent span (task queues) (getsentry#6814) ## Summary - When span streaming is enabled and there is no current span, task queue integrations should not create new root segments for child-span operations - Adds a `sentry_sdk.traces.get_current_span() is None` guard before creating spans in the streaming path - Affected integrations: celery, huey, arq, ray ## Test plan - [ ] Existing tests pass - [ ] Verify that in streaming mode, no orphan root segments are created for task queue operations when there's no active span 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Erica Pisani <hey@ericapisani.dev>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Test plan
🤖 Generated with Claude Code