Merge branch 'main' into windows

Author: trask

instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceClientTest.java

@@ -6,18 +6,13 @@
 package io.opentelemetry.instrumentation.lettuce.v5_1;
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
-import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
-import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.api.StatefulRedisConnection;
-import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.opentelemetry.sdk.trace.data.SpanData;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.jupiter.api.TestInstance;
@@ -88,17 +83,8 @@ private ContainerConnection(StatefulRedisConnection<String, String> connection,
     }
   }
 
-  @SuppressWarnings("deprecation") // using deprecated semconv
   protected static List<AttributeAssertion> addExtraAttributes(AttributeAssertion... assertions) {
-    List<AttributeAssertion> result = new ArrayList<>(Arrays.asList(assertions));
-    if (Boolean.getBoolean("testLatestDeps")) {
-      if (SemconvStability.emitStableDatabaseSemconv()) {
-        result.add(equalTo(DB_NAMESPACE, "0"));
-      } else {
-        result.add(equalTo(DB_REDIS_DATABASE_INDEX, 0));
-      }
-    }
-    return result;
+    return Arrays.asList(assertions);
   }
 
   protected static void assertCommandEncodeEvents(SpanData span) {