fix: spring messaging kotlin async aware instrumentation#11047
Open
fix: spring messaging kotlin async aware instrumentation#11047
Conversation
…consume context to a kotlin suspend consume fun
…ener-instrumentation
ygree
added
type: bug
ygree
force-pushed
the
ygree/spring-messaging-async-aware-instrumentation
branch
from
4885bba to
8eb2a7f
Compare
ygree
force-pushed
the
ygree/spring-messaging-async-aware-instrumentation
branch
from
8eb2a7f to
7e0822f
Compare
ygree
changed the title
mcculls
reviewed
Apr 5, 2026
| implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { | ||
|
|
||
| public KotlinAwareHandlerInstrumentation() { | ||
| super("spring-messaging", "spring-messaging-4"); |
Contributor
There was a problem hiding this comment.
Consider adding an alias that specifically mentions kotlin, such as spring-messaging-kotlin - that would let us disable this specific instrumentation while leaving the main spring-messaging instrumentation enabled.
mcculls
reviewed
Apr 5, 2026
Comment on lines
+45
to
+49
| @Override | ||
| public List<Instrumenter> typeInstrumentations() { | ||
| return Collections.singletonList(new KotlinAwareHandlerInstrumentation()); | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
Remove this - use the default implementation of typeInstrumentations() which does the same thing
Suggested change
| @Override | |
| public List<Instrumenter> typeInstrumentations() { | |
| return Collections.singletonList(new KotlinAwareHandlerInstrumentation()); | |
| } |
mcculls
reviewed
Apr 5, 2026
| span.finish(); | ||
| } | ||
| if (null != error) { | ||
| DECORATE.onError(span, error); |
Contributor
There was a problem hiding this comment.
Isn't this already done above in lines 97-99?
mcculls
reviewed
Apr 5, 2026
Contributor
mcculls
left a comment
mcculls
left a comment
There was a problem hiding this comment.
Looks reasonable, just a couple of things to clean up before this can be merged
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
2 participants
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.
What Does This Do
Adds support for
KotlinAwareInvocableHandlerMethodto pass thespring.consumecontext to a kotlin suspend consume fun and keep the span open for entire async execution.Motivation
A kotlin suspend function execution isn't in scope of the spring.consume.
Additional Notes
Reuse slightly refactored
AsyncResultExtensionsclass to provide a unified way of supporting different asynchronous results.Supersedes: #10831 to keep the span open for entire async execution
Contributor Checklist
type:and (comp:orinst:) labels in addition to any other useful labelsclose,fix, or any linking keywords when referencing an issueUse
solvesinstead, and assign the PR milestone to the issueJira ticket: APMS-18839
Note: Once your PR is ready to merge, add it to the merge queue by commenting
/merge./merge -ccancels the queue request./merge -f --reason "reason"skips all merge queue checks; please use this judiciously, as some checks do not run at the PR-level. For more information, see this doc.