jetty-12.0

Author: SylvainJuge

instrumentation/jetty/jetty-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12InstrumentationModule.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 Jetty12InstrumentationModule extends InstrumentationModule {
+public class Jetty12InstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public Jetty12InstrumentationModule() {
     super("jetty", "jetty-12.0");
@@ -30,4 +32,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new Jetty12ServerInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/jetty/jetty-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12ServerInstrumentation.java

@@ -16,6 +16,7 @@
 import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -43,39 +44,53 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class HandlerAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This Object source,
-        @Advice.Argument(0) Request request,
-        @Advice.Argument(1) Response response,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
+    public static class AdviceScope {
+      private final Context context;
+      private final Scope scope;
+
+      private AdviceScope(Context context, Scope scope) {
+        this.context = context;
+        this.scope = scope;
+      }
 
-      Context parentContext = Java8BytecodeBridge.currentContext();
-      if (!helper().shouldStart(parentContext, request)) {
-        return;
+      @Nullable
+      public static AdviceScope start(Object source, Request request, Response response) {
+        Context parentContext = Java8BytecodeBridge.currentContext();
+        if (!helper().shouldStart(parentContext, request)) {
+          return null;
+        }
+        Context context = helper().start(parentContext, request, response);
+        Scope scope = context.makeCurrent();
+        HttpServerResponseCustomizerHolder.getCustomizer()
+            .customize(context, response, Jetty12ResponseMutator.INSTANCE);
+        return new AdviceScope(context, scope);
       }
 
-      context = helper().start(parentContext, request, response);
-      scope = context.makeCurrent();
+      public void end(Request request, Response response, @Nullable Throwable throwable) {
+        if (scope != null) {
+          scope.close();
+          helper().end(context, request, response, throwable);
+        }
+      }
+    }
 
-      HttpServerResponseCustomizerHolder.getCustomizer()
-          .customize(context, response, Jetty12ResponseMutator.INSTANCE);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    @Nullable
+    public static AdviceScope onEnter(
+        @Advice.This Object source,
+        @Advice.Argument(0) Request request,
+        @Advice.Argument(1) Response response) {
+      return AdviceScope.start(source, request, response);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
         @Advice.Argument(0) Request request,
         @Advice.Argument(1) Response response,
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (scope == null) {
-        return;
-      }
-      scope.close();
-      if (throwable != null) {
-        helper().end(context, request, response, throwable);
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.end(request, response, throwable);
       }
     }
   }