Merge pull request #2 from JonasKunz/indy-reflection-recursion

Fix bootstrap proxy injection

Author: SylvainJuge

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

@@ -45,12 +45,6 @@ public static InstrumentationModuleClassLoader getInstrumentationClassLoader(
 
     String groupName = getModuleGroup(module);
 
-    // this is a hack attempt to make it work
-    if (instrumentedClassLoader != null && instrumentedClassLoader.getClass().getName()
-        .startsWith("io.opentelemetry.javaagent.tooling.HelperInjector$1")) {
-      instrumentedClassLoader = null;
-    }
-
     Map<String, InstrumentationModuleClassLoader> loadersByGroupName =
         instrumentationClassLoaders.get(instrumentedClassLoader);
 

muzzle/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java

@@ -172,7 +172,10 @@ public DynamicType.Builder<?> transform(
     injectedClassLoaders.computeIfAbsent(
         maskNullClassLoader(classLoader),
         cl -> {
-          List<HelperClassDefinition> helpers = helperClassesGenerator.apply(cl);
+
+          List<HelperClassDefinition> helpers = helperClassesGenerator.apply(
+              isBootClassLoader(cl) ? null : cl
+          );
 
           LinkedHashMap<String, Supplier<byte[]>> classesToInject =
               helpers.stream()