make jaxrs indy-ready

instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsAnnotationsInstrumentation.java

@@ -22,10 +22,10 @@
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
 import io.opentelemetry.javaagent.bootstrap.CallDepth;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.lang.reflect.Method;
+import javax.annotation.Nullable;
 import javax.ws.rs.Path;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
@@ -67,52 +67,58 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class JaxRsAnnotationsAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void nameSpan(
-        @Advice.This Object target,
-        @Advice.Origin Method method,
-        @Advice.Local("otelCallDepth") CallDepth callDepth,
-        @Advice.Local("otelHandlerData") HandlerData handlerData,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      callDepth = CallDepth.forClass(Path.class);
-      if (callDepth.getAndIncrement() > 0) {
-        return;
-      }
+    public static class AdviceScope {
+      private final HandlerData handlerData;
+      private final CallDepth callDepth;
+      private final Context context;
+      private final Scope scope;
+
+      public AdviceScope(CallDepth callDepth, Class<?> type, Method method) {
+        this.callDepth = callDepth;
+        if (callDepth.getAndIncrement() > 0) {
+          handlerData = null;
+          context = null;
+          scope = null;
+          return;
+        }
 
-      Context parentContext = Java8BytecodeBridge.currentContext();
-      handlerData = new HandlerData(target.getClass(), method);
+        Context parentContext = Context.current();
+        handlerData = new HandlerData(type, method);
 
-      HttpServerRoute.update(
-          parentContext,
-          HttpServerRouteSource.CONTROLLER,
-          JaxrsServerSpanNaming.SERVER_SPAN_NAME,
-          handlerData);
+        HttpServerRoute.update(
+            parentContext,
+            HttpServerRouteSource.CONTROLLER,
+            JaxrsServerSpanNaming.SERVER_SPAN_NAME,
+            handlerData);
 
-      if (!instrumenter().shouldStart(parentContext, handlerData)) {
-        return;
+        if (!instrumenter().shouldStart(parentContext, handlerData)) {
+          scope = null;
+          context = null;
+          return;
+        }
+
+        context = instrumenter().start(parentContext, handlerData);
+        scope = context.makeCurrent();
       }
 
-      context = instrumenter().start(parentContext, handlerData);
-      scope = context.makeCurrent();
+      public void exit(@Nullable Throwable throwable) {
+        if (callDepth.decrementAndGet() > 0 || scope == null) {
+          return;
+        }
+        scope.close();
+        instrumenter().end(context, handlerData, null, throwable);
+      }
+    }
+
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AdviceScope nameSpan(@Advice.This Object target, @Advice.Origin Method method) {
+      return new AdviceScope(CallDepth.forClass(Path.class), target.getClass(), method);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelCallDepth") CallDepth callDepth,
-        @Advice.Local("otelHandlerData") HandlerData handlerData,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (callDepth.decrementAndGet() > 0) {
-        return;
-      }
-
-      if (scope == null) {
-        return;
-      }
-      scope.close();
-      instrumenter().end(context, handlerData, null, throwable);
+        @Advice.Thrown @Nullable Throwable throwable, @Advice.Enter AdviceScope adviceScope) {
+      adviceScope.exit(throwable);
     }
   }
 }

instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsInstrumentationModule.java

@@ -13,12 +13,14 @@
 import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
 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;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class JaxrsInstrumentationModule extends InstrumentationModule {
+public class JaxrsInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public JaxrsInstrumentationModule() {
     super("jaxrs", "jaxrs-1.0");
   }
@@ -41,4 +43,9 @@ public boolean defaultEnabled(ConfigProperties config) {
     // This instrumentation uses complex type matcher, disabling it can improve startup performance.
     return super.defaultEnabled(config) && ExperimentalConfig.get().controllerTelemetryEnabled();
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/DefaultRequestContextInstrumentation.java

@@ -11,13 +11,12 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
 import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsServerSpanNaming;
 import java.lang.reflect.Method;
+import javax.annotation.Nullable;
 import javax.ws.rs.container.ContainerRequestContext;
 import net.bytebuddy.asm.Advice;
-import net.bytebuddy.asm.Advice.Local;
 
 /**
  * Default context instrumentation.
@@ -37,18 +36,60 @@ protected String abortAdviceName() {
   @SuppressWarnings("unused")
   public static class ContainerRequestContextAdvice {
 
+    public static class AdviceScope {
+      private final Context context;
+      private final Scope scope;
+      private final Jaxrs2HandlerData handlerData;
+
+      private AdviceScope(Context context, Scope scope, Jaxrs2HandlerData handlerData) {
+        this.context = context;
+        this.scope = scope;
+        this.handlerData = handlerData;
+      }
+
+      @Nullable
+      public static AdviceScope enter(Class<?> filterClass, Method method) {
+
+        Context parentContext = Context.current();
+        Jaxrs2HandlerData handlerData = new Jaxrs2HandlerData(filterClass, method);
+
+        HttpServerRoute.update(
+            parentContext,
+            HttpServerRouteSource.CONTROLLER,
+            JaxrsServerSpanNaming.SERVER_SPAN_NAME,
+            handlerData);
+
+        if (!instrumenter().shouldStart(parentContext, handlerData)) {
+          return null;
+        }
+        Context context = instrumenter().start(parentContext, handlerData);
+        return new AdviceScope(context, context.makeCurrent(), handlerData);
+      }
+
+      public void exit(Throwable throwable) {
+        if (scope == null) {
+          return;
+        }
+        scope.close();
+        instrumenter().end(context, handlerData, null, throwable);
+      }
+    }
+
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void createGenericSpan(
-        @Advice.This ContainerRequestContext requestContext,
-        @Local("otelHandlerData") Jaxrs2HandlerData handlerData,
-        @Local("otelContext") Context context,
-        @Local("otelScope") Scope scope) {
+    public static AdviceScope createGenericSpan(
+        @Advice.This ContainerRequestContext requestContext) {
+
       if (requestContext.getProperty(JaxrsConstants.ABORT_HANDLED) != null) {
-        return;
+        return null;
       }
 
       Class<?> filterClass =
           (Class<?>) requestContext.getProperty(JaxrsConstants.ABORT_FILTER_CLASS);
+      if (filterClass == null) {
+        return null;
+      }
+
       Method method = null;
       try {
         method = filterClass.getMethod("filter", ContainerRequestContext.class);
@@ -57,39 +98,20 @@ public static void createGenericSpan(
         // can only be aborted inside the filter method
       }
 
-      if (filterClass == null || method == null) {
-        return;
-      }
-
-      Context parentContext = Java8BytecodeBridge.currentContext();
-      handlerData = new Jaxrs2HandlerData(filterClass, method);
-
-      HttpServerRoute.update(
-          parentContext,
-          HttpServerRouteSource.CONTROLLER,
-          JaxrsServerSpanNaming.SERVER_SPAN_NAME,
-          handlerData);
-
-      if (!instrumenter().shouldStart(parentContext, handlerData)) {
-        return;
+      if (method == null) {
+        return null;
       }
-
-      context = instrumenter().start(parentContext, handlerData);
-      scope = context.makeCurrent();
+      return AdviceScope.enter(filterClass, method);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Local("otelHandlerData") Jaxrs2HandlerData handlerData,
-        @Local("otelContext") Context context,
-        @Local("otelScope") Scope scope,
-        @Advice.Thrown Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
 
-      scope.close();
-      instrumenter().end(context, handlerData, null, throwable);
+      if (adviceScope != null) {
+        adviceScope.exit(throwable);
+      }
     }
   }
 }