open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow dynamic import for io.opentelemetry when matching (#10385)

This commit is contained in:
Lauri Tulmin 2024-02-03 14:31:05 +02:00 committed by GitHub
parent 19dc10d182
commit bb12290af8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentation.java
View File

@ -23,7 +23,8 @@ import net.bytebuddy.matcher.ElementMatcher;
*
* <p>Any side-effect of the ClassLoaderMatcher's call to ClassLoader.getResource() is generally
* undesirable, and so this instrumentation patches the behavior and suppresses the "dynamic import"
* of the missing package/bundle when the call is originating from ClassLoaderMatcher..
* of the missing package/bundle when the call is originating from ClassLoaderMatcher, unless the
* request is for a package for which we explicitly allow the dynamic imports.
*/
class EclipseOsgiInstrumentation implements TypeInstrumentation {
@ -45,8 +46,10 @@ class EclipseOsgiInstrumentation implements TypeInstrumentation {
// "skipOn" is used to skip execution of the instrumented method when a ClassLoaderMatcher is
// currently executing, since we will be returning false regardless in onExit below
@Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class, suppress = Throwable.class)
public static boolean onEnter() {
return InClassLoaderMatcher.get();
public static boolean onEnter(@Advice.Argument(0) String packageName) {
// disable dynamic imports for everything except io.opentelemetry classes to allow dynamic
// import of @WithSpan etc.
return InClassLoaderMatcher.get() && !packageName.startsWith("io.opentelemetry.");
}
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)