make opentelemetry-* indy-ready (#14695)

SylvainJuge · otelbot[bot] · web-flow · commit c10ebeb77661 · 2025-09-26T12:46:19.000Z
Co-authored-by: otelbot &lt;197425009+otelbot@users.noreply.github.com&gt;
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextInstrumentation.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextInstrumentation.java
@@ -15,6 +15,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -41,9 +42,10 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class WrapRootAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(@Advice.Return(readOnly = false) Context root) {
-      root = AgentContextStorage.wrapRootContext(root);
+    public static Context methodExit(@Advice.Return Context root) {
+      return AgentContextStorage.wrapRootContext(root);
     }
   }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextStorageWrappersInstrumentation.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextStorageWrappersInstrumentation.java
@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.function.Function;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -41,13 +42,16 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class AddWrapperAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Return(readOnly = false)
-            List<Function<? super ContextStorage, ? extends ContextStorage>> wrappers) {
-      wrappers = new ArrayList<>(wrappers);
+    public static List<Function<? super ContextStorage, ? extends ContextStorage>> methodExit(
+        @Advice.Return
+            List<Function<? super ContextStorage, ? extends ContextStorage>> originalWrappers) {
+      List<Function<? super ContextStorage, ? extends ContextStorage>> wrappers =
+          new ArrayList<>(originalWrappers);
       // AgentContextStorage wrapper doesn't delegate, so needs to be the innermost wrapper
       wrappers.add(0, AgentContextStorage.wrap());
+      return wrappers;
     }
   }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/InstrumentationUtilInstrumentation.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/InstrumentationUtilInstrumentation.java
@@ -15,6 +15,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -44,12 +45,11 @@ public static boolean methodEnter() {
       return true;
     }
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Argument(0) Context context, @Advice.Return(readOnly = false) boolean result) {
-      result =
-          InstrumentationUtil.shouldSuppressInstrumentation(
-              AgentContextStorage.getAgentContext(context));
+    public static boolean methodExit(@Advice.Argument(0) Context context) {
+      return InstrumentationUtil.shouldSuppressInstrumentation(
+          AgentContextStorage.getAgentContext(context));
     }
   }
 
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java
@@ -43,4 +43,9 @@ public List<String> agentPackagesToHide() {
     // when they haven't been injected
     return Collections.singletonList("io.opentelemetry.javaagent.instrumentation.opentelemetryapi");
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryInstrumentation.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryInstrumentation.java
@@ -17,6 +17,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.util.logging.Logger;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -58,11 +59,10 @@ public static Object onEnter() {
       return null;
     }
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Return(readOnly = false)
-            application.io.opentelemetry.api.OpenTelemetry openTelemetry) {
-      openTelemetry = ApplicationOpenTelemetry.INSTANCE;
+    public static application.io.opentelemetry.api.OpenTelemetry methodExit() {
+      return ApplicationOpenTelemetry.INSTANCE;
     }
   }
 
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/SpanInstrumentation.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/SpanInstrumentation.java
@@ -15,6 +15,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -40,13 +41,11 @@ public static boolean methodEnter() {
       return false;
     }
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit
-    public static void methodExit(
-        @Advice.Argument(0) SpanContext applicationSpanContext,
-        @Advice.Return(readOnly = false) Span applicationSpan) {
-      applicationSpan =
-          Bridging.toApplication(
-              io.opentelemetry.api.trace.Span.wrap(Bridging.toAgent(applicationSpanContext)));
+    public static Span methodExit(@Advice.Argument(0) SpanContext applicationSpanContext) {
+      return Bridging.toApplication(
+          io.opentelemetry.api.trace.Span.wrap(Bridging.toAgent(applicationSpanContext)));
     }
   }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/TestInstrumentation.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/TestInstrumentation.java
@@ -13,6 +13,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -31,12 +32,11 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class TestAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Argument(0) Context context, @Advice.Return(readOnly = false) boolean result) {
-      result =
-          InstrumentationUtil.shouldSuppressInstrumentation(
-              AgentContextStorage.getAgentContext(context));
+    public static boolean onExit(@Advice.Argument(0) Context context) {
+      return InstrumentationUtil.shouldSuppressInstrumentation(
+          AgentContextStorage.getAgentContext(context));
     }
   }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/TestInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/TestInstrumentationModule.java
@@ -29,4 +29,9 @@ public String getModuleGroup() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new TestInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java
@@ -37,4 +37,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   public String getModuleGroup() {
     return "opentelemetry-api-bridge";
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/OpenTelemetryApiInstrumentationModule.java
@@ -37,4 +37,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   public String getModuleGroup() {
     return "opentelemetry-api-bridge";
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java
@@ -43,4 +43,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public String getModuleGroup() {
     return "opentelemetry-api-bridge";
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java
@@ -39,4 +39,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public String getModuleGroup() {
     return "opentelemetry-api-bridge";
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java
@@ -43,4 +43,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public String getModuleGroup() {
     return "opentelemetry-api-bridge";
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java
@@ -40,4 +40,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public String getModuleGroup() {
     return "opentelemetry-api-bridge";
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java
@@ -40,4 +40,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public String getModuleGroup() {
     return "opentelemetry-api-bridge";
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java
@@ -43,4 +43,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public String getModuleGroup() {
     return "opentelemetry-api-bridge";
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/WithSpanInstrumentation.java b/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/WithSpanInstrumentation.java
diff --git a/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/ContextExtensionInstrumentation.java b/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/ContextExtensionInstrumentation.java
diff --git a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/WithSpanInstrumentation.java b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/WithSpanInstrumentation.java
diff --git a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyInstrumentation.java b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyInstrumentation.java
diff --git a/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/AgentSpanTestingInstrumentation.java b/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/AgentSpanTestingInstrumentation.java

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;`
`16`	`16`	`import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage;`
`17`	`17`	`import net.bytebuddy.asm.Advice;`
	`18`	`+import net.bytebuddy.asm.Advice.AssignReturned;`
`18`	`19`	`import net.bytebuddy.description.type.TypeDescription;`
`19`	`20`	`import net.bytebuddy.matcher.ElementMatcher;`
`20`	`21`
`@@ -41,9 +42,10 @@ public void transform(TypeTransformer transformer) {`
`41`	`42`	`@SuppressWarnings("unused")`
`42`	`43`	`public static class WrapRootAdvice {`
`43`	`44`
	`45`	`+ @AssignReturned.ToReturned`
`44`	`46`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)`
`45`		`- public static void methodExit(@Advice.Return(readOnly = false) Context root) {`
`46`		`- root = AgentContextStorage.wrapRootContext(root);`
	`47`	`+ public static Context methodExit(@Advice.Return Context root) {`
	`48`	`+ return AgentContextStorage.wrapRootContext(root);`
`47`	`49`	`}`
`48`	`50`	`}`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,9 @@ public List<String> agentPackagesToHide() {`
`43`	`43`	`// when they haven't been injected`
`44`	`44`	`return Collections.singletonList("io.opentelemetry.javaagent.instrumentation.opentelemetryapi");`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ @Override`
	`48`	`+ public boolean isIndyReady() {`
	`49`	`+ return true;`
	`50`	`+ }`
`46`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;`
`18`	`18`	`import java.util.logging.Logger;`
`19`	`19`	`import net.bytebuddy.asm.Advice;`
	`20`	`+import net.bytebuddy.asm.Advice.AssignReturned;`
`20`	`21`	`import net.bytebuddy.description.type.TypeDescription;`
`21`	`22`	`import net.bytebuddy.matcher.ElementMatcher;`
`22`	`23`
`@@ -58,11 +59,10 @@ public static Object onEnter() {`
`58`	`59`	`return null;`
`59`	`60`	`}`
`60`	`61`
	`62`	`+ @AssignReturned.ToReturned`
`61`	`63`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)`
`62`		`- public static void methodExit(`
`63`		`- @Advice.Return(readOnly = false)`
`64`		`- application.io.opentelemetry.api.OpenTelemetry openTelemetry) {`
`65`		`- openTelemetry = ApplicationOpenTelemetry.INSTANCE;`
	`64`	`+ public static application.io.opentelemetry.api.OpenTelemetry methodExit() {`
	`65`	`+ return ApplicationOpenTelemetry.INSTANCE;`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,9 @@ public String getModuleGroup() {`
`29`	`29`	`public List<TypeInstrumentation> typeInstrumentations() {`
`30`	`30`	`return singletonList(new TestInstrumentation());`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ @Override`
	`34`	`+ public boolean isIndyReady() {`
	`35`	`+ return true;`
	`36`	`+ }`
`32`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {`
`37`	`37`	`public String getModuleGroup() {`
`38`	`38`	`return "opentelemetry-api-bridge";`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ @Override`
	`42`	`+ public boolean isIndyReady() {`
	`43`	`+ return true;`
	`44`	`+ }`
`40`	`45`	`}`