Fix spring kafka context leak when batch listener is retried #10741
Conversation
This file contains 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
zeitlinger
approved these changes
Mar 5, 2024
.../test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java
Show resolved
Hide resolved
zeitlinger
approved these changes
Mar 5, 2024
trask
reviewed
Mar 12, 2024
Comment on lines
+328
to
+329
| // in latest dep tests process spans are not created for retries because spring does | ||
| // not call the success/failure methods on the BatchInterceptor for reties |
There was a problem hiding this comment.
is this comment relevant for the javaagent instrumentation?
There was a problem hiding this comment.
Thanks I left the comment as it is but change the condition so that this branch is only used for library instrumentation. I think ideally we should implement the library instrumentation in a different way to have the library instrumentation create correct traces for retried batches.
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.
Resolves #10698
In later versions of spring kafka
BatchInterceptordoes not work correctly for retries. On retry only theinterceptmethod is called that starts the span, butsuccessandfailurethat end it are not called. This results in a context leak. This PR implements javaagent instrumentation for batch listeners without usingBatchInterceptorand modifies theBatchInterceptorin library instrumentation to ignore retries. Tests are altered to also test retries.To fix handling of retries in the library instrumentation we'll probably need to implement the tracing in a different way. Perhaps we should try wrapping the message listener instead of using
BatchInterceptorandRecordInterceptor?