jaxrs-3.0-*

Author: SylvainJuge

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JerseyInstrumentationModule.java

@@ -11,11 +11,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 java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class JerseyInstrumentationModule extends InstrumentationModule {
+public class JerseyInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public JerseyInstrumentationModule() {
     super("jaxrs", "jaxrs-3.0", "jersey", "jersey-3.0");
   }
@@ -32,4 +34,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new JerseyServletContainerInstrumentation(),
         new JerseyResourceMethodDispatcherInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JerseyRequestContextInstrumentation.java

@@ -14,8 +14,8 @@
 import jakarta.ws.rs.container.ResourceInfo;
 import jakarta.ws.rs.core.UriInfo;
 import java.lang.reflect.Method;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
-import net.bytebuddy.asm.Advice.Local;
 
 /**
  * Jersey specific context instrumentation.
@@ -35,47 +35,59 @@ protected String abortAdviceName() {
   @SuppressWarnings("unused")
   public static class ContainerRequestContextAdvice {
 
+    public static class AdviceScope {
+      public Jaxrs3HandlerData handlerData;
+      public Context context;
+      public Scope scope;
+
+      public AdviceScope(
+          Class<?> resourceClass, Method method, ContainerRequestContext requestContext) {
+        handlerData = new Jaxrs3HandlerData(resourceClass, method);
+        context =
+            Jaxrs3RequestContextHelper.createOrUpdateAbortSpan(
+                instrumenter(), requestContext, handlerData);
+        if (context != null) {
+          scope = context.makeCurrent();
+        }
+      }
+
+      public void exit(@Nullable Throwable throwable) {
+        if (scope == null) {
+          return;
+        }
+        scope.close();
+        instrumenter().end(context, handlerData, null, throwable);
+      }
+    }
+
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void decorateAbortSpan(
-        @Advice.This ContainerRequestContext requestContext,
-        @Local("otelHandlerData") Jaxrs3HandlerData handlerData,
-        @Local("otelContext") Context context,
-        @Local("otelScope") Scope scope) {
-      UriInfo uriInfo = requestContext.getUriInfo();
+    public static AdviceScope decorateAbortSpan(
+        @Advice.This ContainerRequestContext requestContext) {
 
+      UriInfo uriInfo = requestContext.getUriInfo();
       if (requestContext.getProperty(JaxrsConstants.ABORT_HANDLED) != null
           || !(uriInfo instanceof ResourceInfo)) {
-        return;
+        return null;
       }
 
       ResourceInfo resourceInfo = (ResourceInfo) uriInfo;
       Method method = resourceInfo.getResourceMethod();
       Class<?> resourceClass = resourceInfo.getResourceClass();
 
       if (resourceClass == null || method == null) {
-        return;
+        return null;
       }
 
-      handlerData = new Jaxrs3HandlerData(resourceClass, method);
-      context =
-          Jaxrs3RequestContextHelper.createOrUpdateAbortSpan(
-              instrumenter(), requestContext, handlerData);
-      if (context != null) {
-        scope = context.makeCurrent();
-      }
+      return new AdviceScope(resourceClass, method, requestContext);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Local("otelHandlerData") Jaxrs3HandlerData handlerData,
-        @Local("otelContext") Context context,
-        @Local("otelScope") Scope scope,
-        @Advice.Thrown Throwable throwable) {
-      if (scope == null) {
-        return;
+        @Advice.Thrown Throwable throwable, @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.exit(throwable);
       }
-      scope.close();
-      instrumenter().end(context, handlerData, null, throwable);
     }
   }
 }

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ResteasyInstrumentationModule.java

@@ -11,11 +11,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 java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class ResteasyInstrumentationModule extends InstrumentationModule {
+public class ResteasyInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public ResteasyInstrumentationModule() {
     super("jaxrs", "jaxrs-3.0", "resteasy", "resteasy-6.0");
   }
@@ -36,4 +38,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new ResteasyResourceMethodInvokerInstrumentation(),
         new ResteasyResourceLocatorInvokerInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ResteasyRequestContextInstrumentation.java

@@ -10,8 +10,8 @@
 import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import java.lang.reflect.Method;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
-import net.bytebuddy.asm.Advice.Local;
 import org.jboss.resteasy.core.ResourceMethodInvoker;
 import org.jboss.resteasy.core.interception.jaxrs.PostMatchContainerRequestContext;
 
@@ -34,42 +34,54 @@ protected String abortAdviceName() {
   @SuppressWarnings("unused")
   public static class ContainerRequestContextAdvice {
 
+    public static class AdviceScope {
+      private final Jaxrs3HandlerData handlerData;
+      private final Context context;
+      private final Scope scope;
+
+      public AdviceScope(
+          Class<?> resourceClass, Method method, ContainerRequestContext requestContext) {
+        handlerData = new Jaxrs3HandlerData(resourceClass, method);
+        context =
+            Jaxrs3RequestContextHelper.createOrUpdateAbortSpan(
+                ResteasySingletons.instrumenter(), requestContext, handlerData);
+        scope = context != null ? context.makeCurrent() : null;
+      }
+
+      public void exit(Throwable throwable) {
+        if (scope == null) {
+          return;
+        }
+        scope.close();
+        ResteasySingletons.instrumenter().end(context, handlerData, null, throwable);
+      }
+    }
+
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void decorateAbortSpan(
-        @Advice.This ContainerRequestContext requestContext,
-        @Local("otelHandlerData") Jaxrs3HandlerData handlerData,
-        @Local("otelContext") Context context,
-        @Local("otelScope") Scope scope) {
+    public static AdviceScope decorateAbortSpan(
+        @Advice.This ContainerRequestContext requestContext) {
+
       if (requestContext.getProperty(JaxrsConstants.ABORT_HANDLED) != null
           || !(requestContext instanceof PostMatchContainerRequestContext)) {
-        return;
+        return null;
       }
 
       ResourceMethodInvoker resourceMethodInvoker =
           ((PostMatchContainerRequestContext) requestContext).getResourceMethod();
       Method method = resourceMethodInvoker.getMethod();
       Class<?> resourceClass = resourceMethodInvoker.getResourceClass();
 
-      handlerData = new Jaxrs3HandlerData(resourceClass, method);
-      context =
-          Jaxrs3RequestContextHelper.createOrUpdateAbortSpan(
-              ResteasySingletons.instrumenter(), requestContext, handlerData);
-      if (context != null) {
-        scope = context.makeCurrent();
-      }
+      return new AdviceScope(resourceClass, method, requestContext);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Local("otelHandlerData") Jaxrs3HandlerData 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) {
+      if (adviceScope != null) {
+        adviceScope.exit(throwable);
       }
-      scope.close();
-      ResteasySingletons.instrumenter().end(context, handlerData, null, throwable);
     }
   }
 }