fix(kafka): [Queue Instrumentation 25] Finish producer spans on failures#5321
Draft
adinauer wants to merge 1 commit intofix/queue-instrumentation-kafka-baggage-headersfrom
Conversation
Keep a local producer child span reference and always finish it when instrumentation fails after span creation. This preserves fail-open send behavior without leaking unfinished queue.publish spans. Add a regression test covering header injection failures. Co-Authored-By: Claude <noreply@anthropic.com>
This was referenced Apr 22, 2026
Draft
Draft
Draft
📲 Install BuildsAndroid
|
This was referenced Apr 22, 2026
Draft
8 tasks
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
This closes the
queue.publishproducer span even when Kafka header injection fails.The producer interceptor now keeps a local span reference, marks the span as
INTERNAL_ERRORwhen instrumentation throws after span creation, and finishes it infinally.It also adds a regression test covering header injection failures.
💡 Motivation and Context
The current producer path logs and fails open when instrumentation throws, but a failure after
startChild(...)can leave the created child span unfinished.Finishing that span in
finallypreserves the fail-open send behavior while keeping the span lifecycle consistent.💚 How did you test it?
./gradlew spotlessApply apiDump :sentry-kafka:test --tests='io.sentry.kafka.SentryKafkaProducerInterceptorTest'📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
None.
#skip-changelog