Add instrumentationEnabled configuration option and improve shouldStart implementation

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

@@ -40,6 +40,7 @@ public static LettuceTelemetryBuilder builder(OpenTelemetry openTelemetry) {
   LettuceTelemetry(
       OpenTelemetry openTelemetry,
       boolean statementSanitizationEnabled,
+      boolean instrumentationEnabled,
       OperationListener metrics) {
     this.metrics = metrics;
     TracerBuilder tracerBuilder = openTelemetry.tracerBuilder(INSTRUMENTATION_NAME);
@@ -50,9 +51,11 @@ public static LettuceTelemetryBuilder builder(OpenTelemetry openTelemetry) {
     tracer = tracerBuilder.build();
     sanitizer = RedisCommandSanitizer.create(statementSanitizationEnabled);
 
-    // Create instrumenter for shouldStart checks
+    // 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")
-        .buildInstrumenter(SpanKindExtractor.alwaysInternal());
+        .setEnabled(instrumentationEnabled)
+        .buildInstrumenter();
   }
 
   /**

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

@@ -17,6 +17,7 @@ public final class LettuceTelemetryBuilder {
   private final OpenTelemetry openTelemetry;
 
   private boolean statementSanitizationEnabled = true;
+  private boolean instrumentationEnabled = true;
 
   LettuceTelemetryBuilder(OpenTelemetry openTelemetry) {
     this.openTelemetry = openTelemetry;
@@ -34,6 +35,16 @@ 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}.
@@ -42,6 +53,7 @@ public LettuceTelemetry build() {
     return new LettuceTelemetry(
         openTelemetry,
         statementSanitizationEnabled,
+        instrumentationEnabled,
         DbClientMetrics.get().create(openTelemetry.getMeterProvider().get(INSTRUMENTATION_NAME)));
   }
 }

instrumentation/lettuce/lettuce-5.1/library/src/test/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceShouldStartTest.java

@@ -52,7 +52,7 @@ static void cleanUp() {
 
   @Test
   void shouldNotCreateSpansWhenInstrumentationDisabled() {
-    // Create OpenTelemetry instance with instrumentation disabled
+    // Create OpenTelemetry instance
     InMemorySpanExporter spanExporter = InMemorySpanExporter.create();
     SdkTracerProvider tracerProvider =
         SdkTracerProvider.builder()
@@ -63,9 +63,9 @@ void shouldNotCreateSpansWhenInstrumentationDisabled() {
         .setTracerProvider(tracerProvider)
         .build();
 
-    // Create LettuceTelemetry with disabled instrumenter (this is a simplified test)
-    // In a real scenario, instrumentation would be disabled via configuration
+    // Create LettuceTelemetry with instrumentation disabled
     LettuceTelemetry lettuceTelemetry = LettuceTelemetry.builder(openTelemetry)
+        .setInstrumentationEnabled(false)
         .build();
 
     redisClient = RedisClient.create(
@@ -82,9 +82,8 @@ void shouldNotCreateSpansWhenInstrumentationDisabled() {
 
     assertThat(value).isEqualTo("test-value");
 
-    // For this basic test, we just verify that operations work
-    // A more sophisticated test would involve actually disabling the instrumenter
-    // via configuration and verifying no spans are created
+    // Verify no spans were created due to disabled instrumentation
+    assertThat(spanExporter.getFinishedSpanItems()).isEmpty();
   }
 
   @Test