Revert changes not needed anymore after self-review

Author: JonasKunz

instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java

@@ -10,13 +10,11 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class ClassLoaderInstrumentationModule extends InstrumentationModule
-    implements ExperimentalInstrumentationModule {
+public class ClassLoaderInstrumentationModule extends InstrumentationModule {
   public ClassLoaderInstrumentationModule() {
     super("internal-class-loader");
   }

instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ResourceInjectionInstrumentation.java

@@ -8,8 +8,6 @@
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
-import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
-import static net.bytebuddy.matcher.ElementMatchers.not;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
@@ -34,12 +32,7 @@ public class ResourceInjectionInstrumentation implements TypeInstrumentation {
 
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
-    return extendsClass(named("java.lang.ClassLoader"))
-        .and(
-            not(
-                namedOneOf(
-                    "io.opentelemetry.javaagent.bootstrap.AgentClassLoader",
-                    "io.opentelemetry.javaagent.tooling.instrumentation.indy.InstrumentationModuleClassLoader")));
+    return extendsClass(named("java.lang.ClassLoader"));
   }
 
   @Override

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/InstrumentationModuleClassLoader.java

@@ -150,9 +150,8 @@ public synchronized void installModule(InstrumentationModule module) {
                     className -> BytecodeWithUrl.create(className, agentOrExtensionCl)));
     installInjectedClasses(classesToInject);
     if (module instanceof ExperimentalInstrumentationModule) {
-      ExperimentalInstrumentationModule experimentalModule =
-          (ExperimentalInstrumentationModule) module;
-      hiddenAgentPackages.addAll(experimentalModule.agentPackagesToHide());
+      hiddenAgentPackages.addAll(
+          ((ExperimentalInstrumentationModule) module).agentPackagesToHide());
     }
   }