Fix tests to work with lettuce 7.0 (#15120)

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

Author: trask

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

@@ -102,6 +102,24 @@ void testAuthCommand() throws Exception {
                                           maybeStable(DB_STATEMENT),
                                           stringAssert ->
                                               stringAssert.startsWith("CLIENT SETINFO lib-ver"))))),
+              trace ->
+                  trace.hasSpansSatisfyingExactly(
+                      span ->
+                          span.hasName("CLIENT")
+                              .hasKind(SpanKind.CLIENT)
+                              .hasAttributesSatisfyingExactly(
+                                  addExtraAttributes(
+                                      equalTo(NETWORK_TYPE, "ipv4"),
+                                      equalTo(NETWORK_PEER_ADDRESS, ip),
+                                      equalTo(NETWORK_PEER_PORT, port),
+                                      equalTo(SERVER_ADDRESS, host),
+                                      equalTo(SERVER_PORT, port),
+                                      equalTo(maybeStable(DB_SYSTEM), "redis"),
+                                      satisfies(
+                                          maybeStable(DB_STATEMENT),
+                                          stringAssert ->
+                                              stringAssert.startsWith(
+                                                  "CLIENT MAINT_NOTIFICATIONS"))))),
               trace ->
                   trace.hasSpansSatisfyingExactly(
                       span ->

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

@@ -238,8 +238,8 @@ void testListCommand() {
     RedisCommands<String, String> commands = containerConnection.connection.sync();
 
     if (Boolean.getBoolean("testLatestDeps")) {
-      // ignore CLIENT SETINFO traces
-      testing().waitForTraces(2);
+      // ignore CLIENT SETINFO and MAINT_NOTIFICATIONS traces
+      testing().waitForTraces(3);
       testing().clearData();
     }
 
@@ -417,6 +417,24 @@ void testDebugSegfaultCommandWithNoArgumentProducesNoSpan() {
                                           maybeStable(DB_STATEMENT),
                                           stringAssert ->
                                               stringAssert.startsWith("CLIENT SETINFO lib-ver"))))),
+              trace ->
+                  trace.hasSpansSatisfyingExactly(
+                      span ->
+                          span.hasName("CLIENT")
+                              .hasKind(SpanKind.CLIENT)
+                              .hasAttributesSatisfyingExactly(
+                                  addExtraAttributes(
+                                      equalTo(NETWORK_TYPE, "ipv4"),
+                                      equalTo(NETWORK_PEER_ADDRESS, ip),
+                                      equalTo(NETWORK_PEER_PORT, containerConnection.port),
+                                      equalTo(SERVER_ADDRESS, host),
+                                      equalTo(SERVER_PORT, containerConnection.port),
+                                      equalTo(maybeStable(DB_SYSTEM), "redis"),
+                                      satisfies(
+                                          maybeStable(DB_STATEMENT),
+                                          stringAssert ->
+                                              stringAssert.startsWith(
+                                                  "CLIENT MAINT_NOTIFICATIONS"))))),
               trace ->
                   trace.hasSpansSatisfyingExactly(
                       span ->
@@ -459,8 +477,8 @@ void testShutdownCommandProducesNoSpan() {
     RedisCommands<String, String> commands = containerConnection.connection.sync();
 
     if (Boolean.getBoolean("testLatestDeps")) {
-      // ignore CLIENT SETINFO traces
-      testing().waitForTraces(2);
+      // ignore CLIENT SETINFO and MAINT_NOTIFICATIONS traces
+      testing().waitForTraces(3);
       testing().clearData();
     }