From 45fbf4b47b7fdc76adda0c6cccefd2a9518c32f2 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Tue, 30 May 2023 12:23:16 +0300
Subject: [PATCH] Skip not decorator check for classes in boot loader (#8594)

---
 .../instrumentation/InstrumentationModuleInstaller.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);