lettuce-5.1

Author: SylvainJuge

instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceAsyncCommandInstrumentation.java

@@ -5,14 +5,14 @@
 
 package io.opentelemetry.javaagent.instrumentation.lettuce.v5_1;
 
+import static io.opentelemetry.javaagent.instrumentation.lettuce.v5_1.LettuceSingletons.CONTEXT;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
 
 import io.lettuce.core.protocol.AsyncCommand;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -42,22 +42,21 @@ public static class SaveContextAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void saveContext(@Advice.This AsyncCommand<?, ?, ?> asyncCommand) {
       Context context = Java8BytecodeBridge.currentContext();
-      VirtualField.find(AsyncCommand.class, Context.class).set(asyncCommand, context);
+      CONTEXT.set(asyncCommand, context);
     }
   }
 
   @SuppressWarnings("unused")
   public static class RestoreContextAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This AsyncCommand<?, ?, ?> asyncCommand, @Advice.Local("otelScope") Scope scope) {
-      Context context = VirtualField.find(AsyncCommand.class, Context.class).get(asyncCommand);
-      scope = context.makeCurrent();
+    public static Scope onEnter(@Advice.This AsyncCommand<?, ?, ?> asyncCommand) {
+      Context context = CONTEXT.get(asyncCommand);
+      return context.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(@Advice.Local("otelScope") Scope scope) {
+    public static void onExit(@Advice.Enter Scope scope) {
       scope.close();
     }
   }

instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceInstrumentationModule.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 LettuceInstrumentationModule extends InstrumentationModule {
+public class LettuceInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public LettuceInstrumentationModule() {
     super("lettuce", "lettuce-5.1");
@@ -36,4 +38,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return asList(
         new DefaultClientResourcesInstrumentation(), new LettuceAsyncCommandInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceSingletons.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.lettuce.v5_1;
+
+import io.lettuce.core.protocol.AsyncCommand;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.api.util.VirtualField;
+
+public class LettuceSingletons {
+
+  public static final VirtualField<AsyncCommand<?, ?, ?>, Context> CONTEXT =
+      VirtualField.find(AsyncCommand.class, Context.class);
+
+  private LettuceSingletons() {}
+}