internal-eclipse-osgi-3.6

Author: SylvainJuge

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,15 @@ 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) {
+    public static boolean onExit(
+        @Advice.Return boolean originalResult, @Advice.Enter boolean inClassLoaderMatcher) {
+      boolean result = originalResult;
       if (inClassLoaderMatcher) {
         result = false;
       }
+      return result;
     }
   }
 }

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;
+  }
 }