make rmi instrumentation indy-compatible + add module opener #12585
+154
−7
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
…nstrumentation into indy-rmi
SylvainJuge
changed the title
JonasKunz
reviewed
Dec 18, 2024
...g/javaagent-tooling-java9/src/main/java/io/opentelemetry/javaagent/tooling/ModuleOpener.java
Outdated
Show resolved
Hide resolved
| import java.util.Set; | ||
| import java.util.logging.Logger; | ||
|
|
||
| public class ModuleOpener { |
There was a problem hiding this comment.
Shouldn't there also be a no-op implementation of this class in the non-java9 tooling project?
Otherwise we'll get a ClassNotFoundException on Java 8 I think?
This is likely not covered by CI tests yet because we don't rund the indy tests on multiple java versions.
There was a problem hiding this comment.
The other classes from this module are used with a try/catch(UnsupportedClassVersionError), but here we can also use net.bytebuddy.utility.JavaModule#isSupported, I've added that in 9c251f0
There was a problem hiding this comment.
Interesting, I though that the tooling-java9 project would be bundled as Multi Release Jar
...emetry/javaagent/instrumentation/rmi/context/RmiContextPropagationInstrumentationModule.java
Show resolved
Hide resolved
...g/javaagent-tooling-java9/src/main/java/io/opentelemetry/javaagent/tooling/ModuleOpener.java
Outdated
Show resolved
Hide resolved
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.
part of #11457
This adds a new
ModuleOpenerthat allows to open modules for indy instrumentation in a declarative way, this will later be required to implement the LDAP instrumentation.Existing module opens/exports that have been done with dedicated instrumentations like
io.opentelemetry.javaagent.instrumentation.rmi.context.jpms.ExposeRmiModuleInstrumentationhave been left as-is as they are still relevant for inlined instrumentation. Removing those will be possible once indy instrumentation is applied everywhere.Related PR in the Elastic APM agent where this approach was initially created by @JonasKunz : elastic/apm-agent-java#2977 (this one being also the one covering the LDAP instrumentation).
This new
ModuleOpeneris tested indirectly through RMI tests as it fails with indy instrumentation otherwise.