Rework shutdown in lettuce 5.0 tests (#12927)

open-telemetry · Dec 19, 2024 · f612bf8 · f612bf8
1 parent a84ade1
commit f612bf8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/...va/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/AbstractLettuceClientTest.java b/...va/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/AbstractLettuceClientTest.java
@@ -11,6 +11,7 @@
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -78,4 +79,16 @@ protected static StatefulRedisConnection<String, String> newContainerConnection(
 
     return statefulConnection;
   }
+
+  static void shutdown(RedisClient redisClient) {
+    // using shutdownAsync instead of redisClient.shutdown() because there is a bug in the redis
+    // client that can cause the shutdown to hang
+    try {
+      redisClient.shutdownAsync(0, 15, TimeUnit.SECONDS).get(15, TimeUnit.SECONDS);
+    } catch (InterruptedException exception) {
+      Thread.currentThread().interrupt();
+    } catch (Exception exception) {
+      // ignore
+    }
+  }
 }
diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java b/.../java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java
@@ -93,7 +93,7 @@ static void setUp() throws UnknownHostException {
   @AfterAll
   static void cleanUp() {
     connection.close();
-    redisClient.shutdown();
+    shutdown(redisClient);
     redisServer.stop();
   }
 

diff --git a/...va/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java b/...va/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java
@@ -63,7 +63,7 @@ static void setUp() throws UnknownHostException {
   @AfterAll
   static void cleanUp() {
     connection.close();
-    redisClient.shutdown();
+    shutdown(redisClient);
     redisServer.stop();
   }
 

diff --git a/...t/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java b/...t/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java
@@ -74,7 +74,7 @@ static void setUp() throws UnknownHostException {
   @AfterAll
   static void cleanUp() {
     connection.close();
-    redisClient.shutdown();
+    shutdown(redisClient);
     redisServer.stop();
   }