make internal indy-ready (#14646)

SylvainJuge · web-flow · commit c0db6bab4df3 · 2025-09-24T08:17:37.000Z
diff --git a/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/BootDelegationInstrumentation.java b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/BootDelegationInstrumentation.java
@@ -21,6 +21,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -99,13 +100,15 @@ public static Class<?> onEnter(@Advice.Argument(0) String name) {
       return null;
     }
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Return(readOnly = false) Class<?> result,
-        @Advice.Enter Class<?> resultFromBootstrapLoader) {
+    public static Class<?> onExit(
+        @Advice.Return Class<?> originalResult, @Advice.Enter Class<?> resultFromBootstrapLoader) {
+      Class<?> result = originalResult;
       if (resultFromBootstrapLoader != null) {
         result = resultFromBootstrapLoader;
       }
+      return result;
     }
   }
 }
diff --git a/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java
@@ -48,4 +48,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new ResourceInjectionInstrumentation(),
         new DefineClassInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    // This module uses inlined advices to prevent recursion issues with invokedynamic, which is
+    // forced by using 'applyInlineAdvice' in 'transform' method of instrumentations.
+    return true;
+  }
 }
diff --git a/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/LoadInjectedClassInstrumentation.java b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/LoadInjectedClassInstrumentation.java
@@ -20,6 +20,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -59,20 +60,14 @@ public static class LoadClassAdvice {
     @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class)
     public static Class<?> onEnter(
         @Advice.This ClassLoader classLoader, @Advice.Argument(0) String name) {
-      Class<?> helperClass = InjectedClassHelper.loadHelperClass(classLoader, name);
-      if (helperClass != null) {
-        return helperClass;
-      }
-
-      return null;
+      return InjectedClassHelper.loadHelperClass(classLoader, name);
     }
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void onExit(
-        @Advice.Return(readOnly = false) Class<?> result, @Advice.Enter Class<?> loadedClass) {
-      if (loadedClass != null) {
-        result = loadedClass;
-      }
+    public static Class<?> onExit(
+        @Advice.Return Class<?> originalResult, @Advice.Enter Class<?> loadedClass) {
+      return loadedClass != null ? loadedClass : originalResult;
     }
   }
 }
diff --git a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentation.java b/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentation.java
@@ -13,6 +13,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -52,13 +53,11 @@ public static boolean onEnter(@Advice.Argument(0) String packageName) {
       return InClassLoaderMatcher.get() && !packageName.startsWith("io.opentelemetry.");
     }
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Return(readOnly = false) boolean result,
-        @Advice.Enter boolean inClassLoaderMatcher) {
-      if (inClassLoaderMatcher) {
-        result = false;
-      }
+    public static boolean onExit(
+        @Advice.Return boolean originalResult, @Advice.Enter boolean inClassLoaderMatcher) {
+      return inClassLoaderMatcher ? false : originalResult;
     }
   }
 }
diff --git a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java b/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java
@@ -10,11 +10,13 @@
 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 EclipseOsgiInstrumentationModule extends InstrumentationModule {
+public class EclipseOsgiInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public EclipseOsgiInstrumentationModule() {
     super("internal-eclipse-osgi", "internal-eclipse-osgi-3.6");
   }
@@ -29,4 +31,9 @@ public boolean defaultEnabled(ConfigProperties config) {
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new EclipseOsgiInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/main/java/instrumentation/TestTypeInstrumentation.java b/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/main/java/instrumentation/TestTypeInstrumentation.java
@@ -11,6 +11,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -32,21 +33,21 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class TestAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit
-    public static void methodExit(
-        @Advice.This Runnable test, @Advice.Return(readOnly = false) String result) {
+    public static String methodExit(@Advice.This Runnable test) {
       VirtualField.find(Runnable.class, String.class).set(test, "instrumented");
-      result = "instrumented";
+      return "instrumented";
     }
   }
 
   @SuppressWarnings("unused")
   public static class Test2Advice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit
-    public static void methodExit(
-        @Advice.This Runnable test, @Advice.Return(readOnly = false) String result) {
-      result = VirtualField.find(Runnable.class, String.class).get(test);
+    public static String methodExit(@Advice.This Runnable test) {
+      return VirtualField.find(Runnable.class, String.class).get(test);
     }
   }
 }
diff --git a/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java
@@ -10,10 +10,12 @@
 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 java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class TestInstrumentationModule extends InstrumentationModule {
+public class TestInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public TestInstrumentationModule() {
     super("test-instrumentation");
   }
@@ -22,4 +24,9 @@ public TestInstrumentationModule() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new TestTypeInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestTypeInstrumentation.java b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestTypeInstrumentation.java
@@ -11,6 +11,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -34,9 +35,10 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class GetHostNameAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit
-    public static void methodExit(@Advice.Return(readOnly = false) String hostName) {
-      hostName = "not-the-host-name";
+    public static String methodExit() {
+      return "not-the-host-name";
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;`
`22`	`22`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;`
`23`	`23`	`import net.bytebuddy.asm.Advice;`
	`24`	`+import net.bytebuddy.asm.Advice.AssignReturned;`
`24`	`25`	`import net.bytebuddy.description.method.MethodDescription;`
`25`	`26`	`import net.bytebuddy.description.type.TypeDescription;`
`26`	`27`	`import net.bytebuddy.matcher.ElementMatcher;`
`@@ -99,13 +100,15 @@ public static Class<?> onEnter(@Advice.Argument(0) String name) {`
`99`	`100`	`return null;`
`100`	`101`	`}`
`101`	`102`
	`103`	`+ @AssignReturned.ToReturned`
`102`	`104`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)`
`103`		`- public static void onExit(`
`104`		`- @Advice.Return(readOnly = false) Class<?> result,`
`105`		`- @Advice.Enter Class<?> resultFromBootstrapLoader) {`
	`105`	`+ public static Class<?> onExit(`
	`106`	`+ @Advice.Return Class<?> originalResult, @Advice.Enter Class<?> resultFromBootstrapLoader) {`
	`107`	`+ Class<?> result = originalResult;`
`106`	`108`	`if (resultFromBootstrapLoader != null) {`
`107`	`109`	`result = resultFromBootstrapLoader;`
`108`	`110`	`}`
	`111`	`+ return result;`
`109`	`112`	`}`
`110`	`113`	`}`
`111`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,11 @@ public List<TypeInstrumentation> typeInstrumentations() {`
`48`	`48`	`new ResourceInjectionInstrumentation(),`
`49`	`49`	`new DefineClassInstrumentation());`
`50`	`50`	`}`
	`51`	`+`
	`52`	`+ @Override`
	`53`	`+ public boolean isIndyReady() {`
	`54`	`+ // This module uses inlined advices to prevent recursion issues with invokedynamic, which is`
	`55`	`+ // forced by using 'applyInlineAdvice' in 'transform' method of instrumentations.`
	`56`	`+ return true;`
	`57`	`+ }`
`51`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;`
`14`	`14`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;`
`15`	`15`	`import net.bytebuddy.asm.Advice;`
	`16`	`+import net.bytebuddy.asm.Advice.AssignReturned;`
`16`	`17`	`import net.bytebuddy.description.type.TypeDescription;`
`17`	`18`	`import net.bytebuddy.matcher.ElementMatcher;`
`18`	`19`
`@@ -52,13 +53,11 @@ public static boolean onEnter(@Advice.Argument(0) String packageName) {`
`52`	`53`	`return InClassLoaderMatcher.get() && !packageName.startsWith("io.opentelemetry.");`
`53`	`54`	`}`
`54`	`55`
	`56`	`+ @AssignReturned.ToReturned`
`55`	`57`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)`
`56`		`- public static void onExit(`
`57`		`- @Advice.Return(readOnly = false) boolean result,`
`58`		`- @Advice.Enter boolean inClassLoaderMatcher) {`
`59`		`- if (inClassLoaderMatcher) {`
`60`		`- result = false;`
`61`		`- }`
	`58`	`+ public static boolean onExit(`
	`59`	`+ @Advice.Return boolean originalResult, @Advice.Enter boolean inClassLoaderMatcher) {`
	`60`	`+ return inClassLoaderMatcher ? false : originalResult;`
`62`	`61`	`}`
`63`	`62`	`}`
`64`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;`
`12`	`12`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;`
`13`	`13`	`import net.bytebuddy.asm.Advice;`
	`14`	`+import net.bytebuddy.asm.Advice.AssignReturned;`
`14`	`15`	`import net.bytebuddy.description.type.TypeDescription;`
`15`	`16`	`import net.bytebuddy.matcher.ElementMatcher;`
`16`	`17`
`@@ -34,9 +35,10 @@ public void transform(TypeTransformer transformer) {`
`34`	`35`	`@SuppressWarnings("unused")`
`35`	`36`	`public static class GetHostNameAdvice {`
`36`	`37`
	`38`	`+ @AssignReturned.ToReturned`
`37`	`39`	`@Advice.OnMethodExit`
`38`		`- public static void methodExit(@Advice.Return(readOnly = false) String hostName) {`
`39`		`- hostName = "not-the-host-name";`
	`40`	`+ public static String methodExit() {`
	`41`	`+ return "not-the-host-name";`
`40`	`42`	`}`
`41`	`43`	`}`
`42`	`44`	`}`