Add server.address and server.port for lettuce

Author: steverao

instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncCommandsInstrumentation.java

@@ -70,7 +70,7 @@ public static AdviceScope onEnter(
         @Advice.Argument(0) RedisCommand<?, ?, ?> command) {
 
       StatefulConnection<?, ?> connection = asyncCommands.getConnection();
-      RedisURI redisUri = CONNECTION_URI.get(connection);
+      RedisURI redisUri = connection != null ? CONNECTION_URI.get(connection) : null;
 
       if (redisUri != null) {
         COMMAND_CONNECTION_INFO.set(command, redisUri);

instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSingletons.java

@@ -36,8 +36,8 @@ public final class LettuceSingletons {
       VirtualField.find(AsyncCommand.class, Context.class);
   public static final VirtualField<StatefulConnection<?, ?>, RedisURI> CONNECTION_URI =
       VirtualField.find(StatefulConnection.class, RedisURI.class);
-  public static final VirtualField<RedisCommand<?, ?, ?>, RedisURI>
-      COMMAND_CONNECTION_INFO = VirtualField.find(RedisCommand.class, RedisURI.class);
+  public static final VirtualField<RedisCommand<?, ?, ?>, RedisURI> COMMAND_CONNECTION_INFO =
+      VirtualField.find(RedisCommand.class, RedisURI.class);
 
   static {
     LettuceDbAttributesGetter dbAttributesGetter = new LettuceDbAttributesGetter();

instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSingletons.java

@@ -36,8 +36,8 @@ public final class LettuceSingletons {
       VirtualField.find(AsyncCommand.class, Context.class);
   public static final VirtualField<StatefulConnection<?, ?>, RedisURI> CONNECTION_URI =
       VirtualField.find(StatefulConnection.class, RedisURI.class);
-  public static final VirtualField<RedisCommand<?, ?, ?>, RedisURI>
-      COMMAND_CONNECTION_INFO = VirtualField.find(RedisCommand.class, RedisURI.class);
+  public static final VirtualField<RedisCommand<?, ?, ?>, RedisURI> COMMAND_CONNECTION_INFO =
+      VirtualField.find(RedisCommand.class, RedisURI.class);
 
   static {
     LettuceDbAttributesGetter dbAttributesGetter = new LettuceDbAttributesGetter();

instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/rx/LettuceReactiveCommandsInstrumentation.java

@@ -16,6 +16,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
+import io.lettuce.core.AbstractRedisReactiveCommands;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.protocol.RedisCommand;
@@ -64,14 +65,11 @@ public static <K, V, T> RedisCommand<K, V, T> extractCommandName(
         @Advice.Argument(0) Supplier<RedisCommand<K, V, T>> supplier) {
       RedisCommand<K, V, T> command = supplier.get();
 
-      // Get connection from reactive commands object
       StatefulConnection<?, ?> connection = null;
-      if (reactiveCommands instanceof io.lettuce.core.AbstractRedisReactiveCommands) {
-        connection = ((io.lettuce.core.AbstractRedisReactiveCommands<?, ?>) reactiveCommands).getConnection();
+      if (reactiveCommands instanceof AbstractRedisReactiveCommands) {
+        connection = ((AbstractRedisReactiveCommands<?, ?>) reactiveCommands).getConnection();
       }
 
-      // Set connection info BEFORE creating the span (similar to
-      // LettuceAsyncCommandsInstrumentation)
       RedisURI redisUri = connection != null ? CONNECTION_URI.get(connection) : null;
 
       if (redisUri != null) {
@@ -109,14 +107,11 @@ public static <K, V, T> RedisCommand<K, V, T> extractCommandName(
         @Advice.Argument(0) Supplier<RedisCommand<K, V, T>> supplier) {
       RedisCommand<K, V, T> command = supplier.get();
 
-      // Get connection from reactive commands object
       StatefulConnection<?, ?> connection = null;
-      if (reactiveCommands instanceof io.lettuce.core.AbstractRedisReactiveCommands) {
-        connection = ((io.lettuce.core.AbstractRedisReactiveCommands<?, ?>) reactiveCommands).getConnection();
+      if (reactiveCommands instanceof AbstractRedisReactiveCommands) {
+        connection = ((AbstractRedisReactiveCommands<?, ?>) reactiveCommands).getConnection();
       }
 
-      // Set connection info BEFORE creating the span (similar to
-      // LettuceAsyncCommandsInstrumentation)
       RedisURI redisUri = connection != null ? CONNECTION_URI.get(connection) : null;
 
       if (redisUri != null) {