jedis-3.0

Author: SylvainJuge

instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisConnectionInstrumentation.java

@@ -19,6 +19,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.jedis.JedisRequestContext;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -45,36 +46,51 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class SendCommandAdvice {
 
+    public static class AdviceScope {
+      private final Context context;
+      private final Scope scope;
+      private final JedisRequest request;
+
+      private AdviceScope(Context context, Scope scope, JedisRequest request) {
+        this.context = context;
+        this.scope = scope;
+        this.request = request;
+      }
+
+      @Nullable
+      public static AdviceScope start(
+          Connection connection, ProtocolCommand command, byte[][] args) {
+        Context parentContext = currentContext();
+        JedisRequest request = JedisRequest.create(connection, command, asList(args));
+        if (!instrumenter().shouldStart(parentContext, request)) {
+          return null;
+        }
+        Context context = instrumenter().start(parentContext, request);
+        return new AdviceScope(context, context.makeCurrent(), request);
+      }
+
+      public void end(@Nullable Throwable throwable) {
+        scope.close();
+        JedisRequestContext.endIfNotAttached(instrumenter(), context, request, throwable);
+      }
+    }
+
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
+    public static AdviceScope onEnter(
         @Advice.This Connection connection,
         @Advice.Argument(0) ProtocolCommand command,
-        @Advice.Argument(1) byte[][] args,
-        @Advice.Local("otelJedisRequest") JedisRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      Context parentContext = currentContext();
-      request = JedisRequest.create(connection, command, asList(args));
-      if (!instrumenter().shouldStart(parentContext, request)) {
-        return;
-      }
-
-      context = instrumenter().start(parentContext, request);
-      scope = context.makeCurrent();
+        @Advice.Argument(1) byte[][] args) {
+      return AdviceScope.start(connection, command, args);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelJedisRequest") JedisRequest 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();
-      JedisRequestContext.endIfNotAttached(instrumenter(), context, request, throwable);
     }
   }
 }