myfaces-3.0

Author: SylvainJuge

instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/ActionListenerImplInstrumentation.java

@@ -15,6 +15,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfRequest;
 import jakarta.faces.event.ActionEvent;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -36,34 +37,48 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class ProcessActionAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) ActionEvent event,
-        @Advice.Local("otelRequest") JsfRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      Context parentContext = Java8BytecodeBridge.currentContext();
+    public static class AdviceScope {
+      private final JsfRequest request;
+      private final Context context;
+      private final Scope scope;
+
+      private AdviceScope(JsfRequest request, Context context, Scope scope) {
+        this.request = request;
+        this.context = context;
+        this.scope = scope;
+      }
 
-      request = new JsfRequest(event);
-      if (!request.shouldStartSpan() || !instrumenter().shouldStart(parentContext, request)) {
-        return;
+      @Nullable
+      public static AdviceScope start(@Advice.Argument(0) ActionEvent event) {
+        Context parentContext = Java8BytecodeBridge.currentContext();
+        JsfRequest request = new JsfRequest(event);
+        if (!request.shouldStartSpan() || !instrumenter().shouldStart(parentContext, request)) {
+          return null;
+        }
+        Context context = instrumenter().start(parentContext, request);
+        Scope scope = context.makeCurrent();
+        return new AdviceScope(request, context, scope);
       }
 
-      context = instrumenter().start(parentContext, request);
-      scope = context.makeCurrent();
+      public void end(Throwable throwable) {
+        scope.close();
+        instrumenter().end(context, request, null, throwable);
+      }
+    }
+
+    @Nullable
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AdviceScope onEnter(@Advice.Argument(0) ActionEvent event) {
+      return AdviceScope.start(event);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelRequest") JsfRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (scope == null) {
-        return;
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.end(throwable);
       }
-      scope.close();
-      instrumenter().end(context, request, null, throwable);
     }
   }
 }

instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesInstrumentationModule.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 MyFacesInstrumentationModule extends InstrumentationModule {
+public class MyFacesInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public MyFacesInstrumentationModule() {
     super("jsf-myfaces", "jsf-myfaces-3.0");
   }
@@ -23,4 +25,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return asList(
         new ActionListenerImplInstrumentation(), new RestoreViewExecutorInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }