Extract library instrumentation for lettuce 5.1 (#2533)

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/utils/NetPeerUtils.java

@@ -76,7 +76,8 @@ public void setNetPeer(Span span, String peerName, String peerIp, int port) {
  setNetPeer(span::setAttribute, peerName, peerIp, port);
  }
 
- public void setNetPeer(SpanAttributeSetter span, String peerName, String peerIp, int port) {
+ public void setNetPeer(
+ SpanAttributeSetter span, @Nullable String peerName, @Nullable String peerIp, int port) {
  if (peerName != null && !peerName.equals(peerIp)) {
  span.setAttribute(SemanticAttributes.NET_PEER_NAME, peerName);
  }
@@ -109,6 +110,6 @@ private String mapToPeerService(String endpoint) {
  */
  @FunctionalInterface
  public interface SpanAttributeSetter {
- <T> void setAttribute(AttributeKey<T> key, @Nullable T value);
+ <T> void setAttribute(AttributeKey<T> key, T value);
  }
 }

instrumentation/lettuce/lettuce-5.0/javaagent/lettuce-5.0-javaagent.gradle

@@ -12,7 +12,7 @@ muzzle {
 dependencies {
  compileOnly group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE'
 
- implementation project(':instrumentation:lettuce:lettuce-common:javaagent')
+ implementation project(':instrumentation:lettuce:lettuce-common:library')
 
  testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
  testImplementation group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE'

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

@@ -8,7 +8,7 @@
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.protocol.RedisCommand;
 import io.opentelemetry.instrumentation.api.db.RedisCommandSanitizer;
-import io.opentelemetry.javaagent.instrumentation.lettuce.LettuceArgSplitter;
+import io.opentelemetry.instrumentation.lettuce.common.LettuceArgSplitter;
 import java.util.Collections;
 import java.util.List;
 

instrumentation/lettuce/lettuce-5.1/javaagent/lettuce-5.1-javaagent.gradle

@@ -12,7 +12,9 @@ muzzle {
 dependencies {
  library group: 'io.lettuce', name: 'lettuce-core', version: '5.1.0.RELEASE'
 
- implementation project(':instrumentation:lettuce:lettuce-common:javaagent')
+ implementation project(':instrumentation:lettuce:lettuce-5.1:library')
+
+ testImplementation project(':instrumentation:lettuce:lettuce-5.1:testing')
 
  testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
  // Only 5.2+ will have command arguments in the db.statement tag.

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

@@ -59,7 +59,7 @@ public static class DefaultClientResourcesAdvice {
 
  @Advice.OnMethodExit(suppress = Throwable.class)
  public static void methodEnter(@Advice.Return DefaultClientResources.Builder builder) {
- builder.tracing(OpenTelemetryTracing.INSTANCE);
+ builder.tracing(TracingHolder.TRACING);
  }
  }
 }

instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/TracingHolder.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.tracing.Tracing;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.instrumentation.lettuce.v5_1.LettuceTracing;
+
+public final class TracingHolder {
+
+ public static final Tracing TRACING =
+ LettuceTracing.create(GlobalOpenTelemetry.get()).newTracing();
+
+ private TracingHolder() {}
+}