fix(spring-jakarta): [Queue Instrumentation 10] Fork root scopes and skip when OTel is active in Kafka consumer#5280
Draft
adinauer wants to merge 1 commit intofix/queue-instrumentation-threadlocal-cleanupfrom
Conversation
… Kafka consumer interceptor Use Sentry.forkedRootScopes() instead of scopes.forkedScopes() so each Kafka message starts with a clean scope from root, matching the pattern used by SentryWebFilter for reactive request boundaries. Add isIgnored() check using SpanUtils.isIgnored() on the trace origin so the interceptor no-ops when OTel is active and the origin is in the ignored span origins list, consistent with SentryTracingFilter. Co-Authored-By: Claude <noreply@anthropic.com>
Contributor
Semver Impact of This PR🟢 Patch (bug fixes) 📋 Changelog PreviewThis is how your changes will appear in the changelog. This PR will not appear in the changelog. 🤖 This preview updates automatically when you update the PR. |
This was referenced Apr 10, 2026
Sentry Build Distribution
|
Contributor
Performance metrics 🚀
|
This was referenced Apr 10, 2026
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.
PR Stack (Queue Instrumentation)
📜 Description
Two changes to
SentryKafkaRecordInterceptor:Fork root scopes — Use
Sentry.forkedRootScopes()instead ofscopes.forkedScopes(). Each Kafka message is an independent request boundary, so it should start with a clean scope from root rather than inheriting whatever scope happens to be on the consumer thread. This matches the pattern used bySentryWebFilterfor reactive request boundaries.Skip when OTel is active — Add
isIgnored()check usingSpanUtils.isIgnored()on the trace origin. When OTel is active and the origin is in the ignored span origins list, the interceptor skips instrumentation entirely (no fork, no transaction, no ThreadLocal). This is consistent with howSentryTracingFilterhandles OTel coexistence.💡 Motivation and Context
💚 How did you test it?
Mockito.mockStatic(Sentry::class.java)forforkedRootScopesdoes not create span when origin is ignored📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
Nothing — this completes the root scopes + OTel dedup fix for the consumer interceptor.
#skip-changelog