Add (more) Spring JMS support #6308
Merged
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
trask
commented
Jul 12, 2022
| context.close() | ||
|
|
||
| where: | ||
| config << [AnnotatedListenerConfig, ManualListenerConfig] |
There was a problem hiding this comment.
the existing test (which passed with just JMS listener instrumentation) was AnnotatedListenerConfig, and the new test that exercises the new instrumentation is ManualListenerConfig
|
@trask I think that adding a dependency on |
laurit
reviewed
Jul 12, 2022
laurit
approved these changes
Jul 13, 2022
mateuszrzeszutek
approved these changes
Jul 13, 2022
| @Override | ||
| public void transform(TypeTransformer transformer) { | ||
| transformer.applyAdviceToMethod( | ||
| named("onMessage").and(takesArguments(2)).and(isPublic()), |
There was a problem hiding this comment.
Message is used in the advice
Suggested change
| named("onMessage").and(takesArguments(2)).and(isPublic()), | |
| named("onMessage").and(isPublic()).and(takesArguments(2)).and(takesArgument(0, named("javax.jms.Message"))), |
LironKS
pushed a commit
to helios/opentelemetry-java-instrumentation
that referenced
this pull request
Oct 23, 2022
* Add (more) Spring JMS support * Remove duplication * Better advice matcher
LironKS
pushed a commit
to helios/opentelemetry-java-instrumentation
that referenced
this pull request
Oct 31, 2022
* Add (more) Spring JMS support * Remove duplication * Better advice matcher
LironKS
pushed a commit
to helios/opentelemetry-java-instrumentation
that referenced
this pull request
Dec 4, 2022
* Add (more) Spring JMS support * Remove duplication * Better advice matcher
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.
Adds support for
org.springframework.jms.listener.SessionAwareMessageListenerdirect listener usage.I tried to repro with
@JmsListenerthat acceptsSessionas second arg, but Spring tunnels that through normal 2-arg JMS MessageListener (the one with Session arg), which is already instrumented by JMS instrumentation.Open question
I copy-pasted a bunch of code from the
jms-1.1instrumentation to the newspring-jms-2.0instrumentation.I could alternatively add a direct dependency from
spring-jms-2.0instrumentation onjms-1.1instrumentation.I'm a little worried about the
DbInfoclass loader problem, of having the same classes referenced from two different class loaders.But I guess not, since that was only a problem from passing
DbInfoin between those two class loaders, which I don't think would happen here since nothing would be passed between the two instrumentation, just pure reuse of classes fromjms-1.1.@laurit wdyt?