jaxrs-2.0-jersey

Author: SylvainJuge

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyInstrumentationModule.java

@@ -40,4 +40,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new JerseyServletContainerInstrumentation(),
         new JerseyResourceMethodDispatcherInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyRequestContextInstrumentation.java

@@ -11,11 +11,11 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
 import java.lang.reflect.Method;
+import javax.annotation.Nullable;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ResourceInfo;
 import javax.ws.rs.core.UriInfo;
 import net.bytebuddy.asm.Advice;
-import net.bytebuddy.asm.Advice.Local;
 
 /**
  * Jersey specific context instrumentation.
@@ -35,47 +35,62 @@ protected String abortAdviceName() {
   @SuppressWarnings("unused")
   public static class ContainerRequestContextAdvice {
 
+    public static class AdviceScope {
+      private Jaxrs2HandlerData handlerData;
+      private Context context;
+      private Scope scope;
+
+      public AdviceScope enter(
+          Class<?> resourceClass, Method method, ContainerRequestContext requestContext) {
+        handlerData = new Jaxrs2HandlerData(resourceClass, method);
+        context =
+            Jaxrs2RequestContextHelper.createOrUpdateAbortSpan(
+                instrumenter(), requestContext, handlerData);
+        if (context != null) {
+          scope = context.makeCurrent();
+        }
+        return this;
+      }
+
+      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") Jaxrs2HandlerData handlerData,
-        @Local("otelContext") Context context,
-        @Local("otelScope") Scope scope) {
+    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 Jaxrs2HandlerData(resourceClass, method);
-      context =
-          Jaxrs2RequestContextHelper.createOrUpdateAbortSpan(
-              instrumenter(), requestContext, handlerData);
-      if (context != null) {
-        scope = context.makeCurrent();
-      }
+      AdviceScope adviceScope = new AdviceScope();
+      return adviceScope.enter(resourceClass, method, requestContext);
     }
 
     @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 AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.exit(throwable);
       }
-      scope.close();
-      instrumenter().end(context, handlerData, null, throwable);
     }
   }
 }