Revert lettuce-5.1 changes as requested

Co-authored-by: trask <[email protected]>

Author: Copilot

instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceTelemetry.java

@@ -10,9 +10,7 @@
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.api.trace.TracerBuilder;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.RedisCommandSanitizer;
-import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
-import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
 
 /** Entrypoint for instrumenting Lettuce or clients. */
@@ -35,12 +33,10 @@ public static LettuceTelemetryBuilder builder(OpenTelemetry openTelemetry) {
   private final Tracer tracer;
   private final RedisCommandSanitizer sanitizer;
   private final OperationListener metrics;
-  private final Instrumenter<Object, Void> instrumenter;
 
   LettuceTelemetry(
       OpenTelemetry openTelemetry,
       boolean statementSanitizationEnabled,
-      boolean instrumentationEnabled,
       OperationListener metrics) {
     this.metrics = metrics;
     TracerBuilder tracerBuilder = openTelemetry.tracerBuilder(INSTRUMENTATION_NAME);
@@ -50,19 +46,13 @@ public static LettuceTelemetryBuilder builder(OpenTelemetry openTelemetry) {
     }
     tracer = tracerBuilder.build();
     sanitizer = RedisCommandSanitizer.create(statementSanitizationEnabled);
-    
-    // Create minimal instrumenter only for shouldStart checks
-    // The actual span creation is handled by the existing SpanBuilder mechanism
-    instrumenter = Instrumenter.<Object, Void>builder(openTelemetry, INSTRUMENTATION_NAME, req -> "redis")
-        .setEnabled(instrumentationEnabled)
-        .buildInstrumenter();
   }
 
   /**
    * Returns a new {@link Tracing} which can be used with methods like {@link
    * io.lettuce.core.resource.ClientResources.Builder#tracing(Tracing)}.
    */
   public Tracing newTracing() {
-    return new OpenTelemetryTracing(tracer, sanitizer, metrics, instrumenter);
+    return new OpenTelemetryTracing(tracer, sanitizer, metrics);
   }
 }

instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceTelemetryBuilder.java

@@ -17,7 +17,6 @@ public final class LettuceTelemetryBuilder {
   private final OpenTelemetry openTelemetry;
 
   private boolean statementSanitizationEnabled = true;
-  private boolean instrumentationEnabled = true;
 
   LettuceTelemetryBuilder(OpenTelemetry openTelemetry) {
     this.openTelemetry = openTelemetry;
@@ -35,16 +34,6 @@ public LettuceTelemetryBuilder setStatementSanitizationEnabled(
     return this;
   }
 
-  /**
-   * Sets whether instrumentation should be enabled. If set to {@code false}, no spans will be 
-   * created by the constructed {@link LettuceTelemetry}. Enabled by default.
-   */
-  @CanIgnoreReturnValue
-  public LettuceTelemetryBuilder setInstrumentationEnabled(boolean instrumentationEnabled) {
-    this.instrumentationEnabled = instrumentationEnabled;
-    return this;
-  }
-
   /**
    * Returns a new {@link LettuceTelemetry} with the settings of this {@link
    * LettuceTelemetryBuilder}.
@@ -53,7 +42,6 @@ public LettuceTelemetry build() {
     return new LettuceTelemetry(
         openTelemetry,
         statementSanitizationEnabled,
-        instrumentationEnabled,
         DbClientMetrics.get().create(openTelemetry.getMeterProvider().get(INSTRUMENTATION_NAME)));
   }
 }

instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java

@@ -29,7 +29,6 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.RedisCommandSanitizer;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
 import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor;
@@ -55,20 +54,13 @@ final class OpenTelemetryTracing implements Tracing {
       ServerAttributesExtractor.create(new LettuceServerAttributesGetter());
   private static final AttributesExtractor<OpenTelemetryEndpoint, Void> networkAttributesExtractor =
       NetworkAttributesExtractor.create(new LettuceServerAttributesGetter());
-  
-  // Simple request object for shouldStart checks when we don't have full RedisCommand details
-  private static final Object REDIS_OPERATION_REQUEST = new Object();
-  
   private final TracerProvider tracerProvider;
-  private final Instrumenter<Object, Void> instrumenter;
 
   OpenTelemetryTracing(
       io.opentelemetry.api.trace.Tracer tracer,
       RedisCommandSanitizer sanitizer,
-      OperationListener metrics,
-      Instrumenter<Object, Void> instrumenter) {
-    this.tracerProvider = new OpenTelemetryTracerProvider(tracer, sanitizer, metrics, instrumenter);
-    this.instrumenter = instrumenter;
+      OperationListener metrics) {
+    this.tracerProvider = new OpenTelemetryTracerProvider(tracer, sanitizer, metrics);
   }
 
   @Override
@@ -108,9 +100,8 @@ private static class OpenTelemetryTracerProvider implements TracerProvider {
     OpenTelemetryTracerProvider(
         io.opentelemetry.api.trace.Tracer tracer,
         RedisCommandSanitizer sanitizer,
-        OperationListener metrics,
-        Instrumenter<Object, Void> instrumenter) {
-      openTelemetryTracer = new OpenTelemetryTracer(tracer, sanitizer, metrics, instrumenter);
+        OperationListener metrics) {
+      openTelemetryTracer = new OpenTelemetryTracer(tracer, sanitizer, metrics);
     }
 
     @Override
@@ -152,17 +143,14 @@ private static class OpenTelemetryTracer extends Tracer {
     private final io.opentelemetry.api.trace.Tracer tracer;
     private final RedisCommandSanitizer sanitizer;
     private final OperationListener metrics;
-    private final Instrumenter<Object, Void> instrumenter;
 
     OpenTelemetryTracer(
         io.opentelemetry.api.trace.Tracer tracer,
         RedisCommandSanitizer sanitizer,
-        OperationListener metrics,
-        Instrumenter<Object, Void> instrumenter) {
+        OperationListener metrics) {
       this.tracer = tracer;
       this.sanitizer = sanitizer;
       this.metrics = metrics;
-      this.instrumenter = instrumenter;
     }
 
     @Override
@@ -191,7 +179,7 @@ private OpenTelemetrySpan nextSpan(Context context) {
       if (SemconvStability.emitOldDatabaseSemconv()) {
         spanBuilder.setAttribute(DB_SYSTEM, REDIS);
       }
-      return new OpenTelemetrySpan(context, spanBuilder, sanitizer, metrics, instrumenter);
+      return new OpenTelemetrySpan(context, spanBuilder, sanitizer, metrics);
     }
   }
 
@@ -205,7 +193,6 @@ private static class OpenTelemetrySpan extends Tracer.Span {
     private final SpanBuilder spanBuilder;
     private final RedisCommandSanitizer sanitizer;
     private final OperationListener metrics;
-    private final Instrumenter<Object, Void> instrumenter;
 
     @Nullable private String name;
     @Nullable private List<Object> events;
@@ -220,13 +207,11 @@ private static class OpenTelemetrySpan extends Tracer.Span {
         Context context,
         SpanBuilder spanBuilder,
         RedisCommandSanitizer sanitizer,
-        OperationListener metrics,
-        Instrumenter<Object, Void> instrumenter) {
+        OperationListener metrics) {
       this.context = context;
       this.spanBuilder = spanBuilder;
       this.sanitizer = sanitizer;
       this.metrics = metrics;
-      this.instrumenter = instrumenter;
       this.attributesBuilder = Attributes.builder();
       if (SemconvStability.emitStableDatabaseSemconv()) {
         attributesBuilder.put(DB_SYSTEM_NAME, REDIS);
@@ -276,12 +261,7 @@ private void fillEndpoint(OpenTelemetryEndpoint endpoint) {
     @CanIgnoreReturnValue
     @SuppressWarnings({"UnusedMethod", "EffectivelyPrivate"})
     public synchronized Tracer.Span start(RedisCommand<?, ?, ?> command) {
-      // Check if instrumentation should start for this command
-      if (!instrumenter.shouldStart(context, (Object) command)) {
-        return this;
-      }
-      
-      startSpanInternal();
+      start();
       long startNanos = System.nanoTime();
 
       Span span = this.span;
@@ -321,15 +301,6 @@ public synchronized Tracer.Span start(RedisCommand<?, ?, ?> command) {
     @Override
     @CanIgnoreReturnValue
     public synchronized Tracer.Span start() {
-      // Check if instrumentation should start for generic redis operation
-      if (!instrumenter.shouldStart(context, REDIS_OPERATION_REQUEST)) {
-        return this;
-      }
-      
-      return startSpanInternal();
-    }
-
-    private synchronized Tracer.Span startSpanInternal() {
       span = spanBuilder.startSpan();
       spanStartNanos = System.nanoTime();
       if (name != null) {