jaxws-jws-api

Author: SylvainJuge

instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java

@@ -25,6 +25,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.jaxws.common.JaxWsRequest;
+import javax.annotation.Nullable;
 import javax.jws.WebService;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
@@ -62,42 +63,52 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class JwsAnnotationsAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void startSpan(
-        @Advice.This Object target,
-        @Advice.Origin("#m") String methodName,
-        @Advice.Local("otelCallDepth") CallDepth callDepth,
-        @Advice.Local("otelRequest") JaxWsRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      callDepth = CallDepth.forClass(WebService.class);
-      if (callDepth.getAndIncrement() > 0) {
-        return;
+    public static class AdviceScope {
+      private final CallDepth callDepth;
+      private final JaxWsRequest request;
+      private final Context context;
+      private final Scope scope;
+
+      private AdviceScope(CallDepth callDepth, JaxWsRequest request, Context context, Scope scope) {
+        this.callDepth = callDepth;
+        this.request = request;
+        this.context = context;
+        this.scope = scope;
+      }
+
+      public static AdviceScope start(CallDepth callDepth, Object target, String methodName) {
+        if (callDepth.getAndIncrement() > 0) {
+          return new AdviceScope(callDepth, null, null, null);
+        }
+        Context parentContext = currentContext();
+        JaxWsRequest request = new JaxWsRequest(target.getClass(), methodName);
+        if (!instrumenter().shouldStart(parentContext, request)) {
+          return new AdviceScope(callDepth, null, null, null);
+        }
+        Context context = instrumenter().start(parentContext, request);
+        return new AdviceScope(callDepth, request, context, context.makeCurrent());
       }
 
-      Context parentContext = currentContext();
-      request = new JaxWsRequest(target.getClass(), methodName);
-      if (!instrumenter().shouldStart(parentContext, request)) {
-        return;
+      public void end(Throwable throwable) {
+        if (callDepth.decrementAndGet() > 0 || scope == null) {
+          return;
+        }
+        scope.close();
+        instrumenter().end(context, request, null, throwable);
       }
+    }
 
-      context = instrumenter().start(parentContext, request);
-      scope = context.makeCurrent();
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AdviceScope startSpan(
+        @Advice.This Object target, @Advice.Origin("#m") String methodName) {
+      CallDepth callDepth = CallDepth.forClass(WebService.class);
+      return AdviceScope.start(callDepth, target, methodName);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelCallDepth") CallDepth callDepth,
-        @Advice.Local("otelRequest") JaxWsRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (callDepth.decrementAndGet() > 0 || scope == null) {
-        return;
-      }
-
-      scope.close();
-      instrumenter().end(context, request, null, throwable);
+        @Advice.Thrown @Nullable Throwable throwable, @Advice.Enter AdviceScope adviceScope) {
+      adviceScope.end(throwable);
     }
   }
 }

instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java

@@ -9,12 +9,14 @@
 import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.Collections;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class JwsInstrumentationModule extends InstrumentationModule {
+public class JwsInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public JwsInstrumentationModule() {
     super("jaxws-jws-api", "jaxws-jws-api-1.1", "jaxws");
@@ -30,4 +32,9 @@ public boolean defaultEnabled(ConfigProperties config) {
     // this instrumentation only produces controller telemetry
     return super.defaultEnabled(config) && ExperimentalConfig.get().controllerTelemetryEnabled();
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }