jaxrs-2.0-cxf

Author: SylvainJuge

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfInstrumentationModule.java

@@ -10,10 +10,12 @@
 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;
 
 @AutoService(InstrumentationModule.class)
-public class CxfInstrumentationModule extends InstrumentationModule {
+public class CxfInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public CxfInstrumentationModule() {
     super("jaxrs", "jaxrs-2.0", "cxf", "cxf-3.2");
   }
@@ -26,4 +28,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new CxfRsHttpListenerInstrumentation(),
         new CxfJaxRsInvokerInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfRequestContextInstrumentation.java

@@ -17,9 +17,9 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
 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;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import org.apache.cxf.jaxrs.impl.AbstractRequestContextImpl;
@@ -57,50 +57,65 @@ public void transform(TypeTransformer transformer) {
   @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, AbstractRequestContextImpl requestContext) {
+        handlerData = new Jaxrs2HandlerData(resourceClass, method);
+        context =
+            Jaxrs2RequestContextHelper.createOrUpdateAbortSpan(
+                instrumenter(), (ContainerRequestContext) 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 AbstractRequestContextImpl requestContext,
-        @Local("otelHandlerData") Jaxrs2HandlerData handlerData,
-        @Local("otelContext") Context context,
-        @Local("otelScope") Scope scope) {
+    public static AdviceScope decorateAbortSpan(
+        @Advice.This AbstractRequestContextImpl requestContext) {
 
       if (requestContext.getProperty(JaxrsConstants.ABORT_HANDLED) != null
           || !(requestContext instanceof ContainerRequestContext)) {
-        return;
+        return null;
       }
 
       Message message = requestContext.getMessage();
       OperationResourceInfoStack resourceInfoStack =
           (OperationResourceInfoStack)
               message.get("org.apache.cxf.jaxrs.model.OperationResourceInfoStack");
       if (resourceInfoStack == null || resourceInfoStack.isEmpty()) {
-        return;
+        return null;
       }
 
       MethodInvocationInfo invocationInfo = resourceInfoStack.peek();
       Method method = invocationInfo.getMethodInfo().getMethodToInvoke();
       Class<?> resourceClass = invocationInfo.getRealClass();
 
-      handlerData = new Jaxrs2HandlerData(resourceClass, method);
-      context =
-          Jaxrs2RequestContextHelper.createOrUpdateAbortSpan(
-              instrumenter(), (ContainerRequestContext) 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 Throwable throwable, @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.exit(throwable);
       }
-      scope.close();
-      instrumenter().end(context, handlerData, null, throwable);
     }
   }
 }