fix(spring-jakarta): [Queue Instrumentation 11] Guard entire span lifecycle in Kafka producer interceptor#5281
Draft
adinauer wants to merge 1 commit intofix/queue-instrumentation-root-scopesfrom
Conversation
…terceptor Wrap all span operations (startChild, setData, injectHeaders, finish) in a single try-catch so instrumentation can never break the customer's Kafka send. The record is always returned regardless of any exception in Sentry code. Co-Authored-By: Claude <noreply@anthropic.com>
This was referenced Apr 10, 2026
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
Wrap the entire span lifecycle in
SentryProducerInterceptor.onSend()in a single try-catch so instrumentation can never break the customer's Kafka send. TheProducerRecordis always returned regardless of any exception in Sentry code.Previously, only header injection was guarded. Span creation (
startChild),setData(), andfinish()were unguarded — any exception from these would propagate and fail the customer's Kafka send per theProducerInterceptor.onSend()contract.The inner try-catch around
injectHeadersis removed since the outer catch now covers it.💡 Motivation and Context
Kafka's
ProducerInterceptor.onSend()contract requires that interceptors not throw exceptions — any exception propagates and fails the send. Observability code must never cause customer message loss.💚 How did you test it?
SentryProducerInterceptorTesttests pass📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
Nothing.
#skip-changelog