diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java index 3afa9061c4..981b3345a1 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java @@ -116,7 +116,9 @@ public final class InstrumentationModuleInstaller { classLoaderMatcher, "Instrumentation class loader matcher unexpected exception: " + classLoaderMatcher)) - .and(NOT_DECORATOR_MATCHER) + .and( + (typeDescription, classLoader, module, classBeingRedefined, protectionDomain) -> + classLoader == null || NOT_DECORATOR_MATCHER.matches(typeDescription)) .and(muzzleMatcher) .transform(ConstantAdjuster.instance()) .transform(helperInjector);