[#9913] Apply testcontainers to redis-lettuce-plugin-it

Author: emeroad

plugins-it/redis-lettuce-it/pom.xml

@@ -76,9 +76,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>it.ozimov</groupId>
-            <artifactId>embedded-redis</artifactId>
-            <version>0.7.3</version>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

plugins-it/redis-lettuce-it/src/test/java/com/navercorp/pinpoint/plugin/lettuce/RedisClient_IT.java

@@ -17,7 +17,6 @@
 package com.navercorp.pinpoint.plugin.lettuce;
 
 import com.navercorp.pinpoint.bootstrap.plugin.test.Expectations;
-import com.navercorp.pinpoint.bootstrap.plugin.test.ExpectedTrace;
 import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifier;
 import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifierHolder;
 import com.navercorp.pinpoint.pluginit.utils.AgentPath;
@@ -31,7 +30,6 @@
 import com.navercorp.pinpoint.test.plugin.shared.SharedTestBeforeAllResult;
 import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass;
 import io.lettuce.core.AbstractRedisAsyncCommands;
-import io.lettuce.core.RedisAsyncCommandsImpl;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -53,26 +51,29 @@
 @ImportPlugin("com.navercorp.pinpoint:pinpoint-redis-lettuce-plugin")
 @Dependency({"io.lettuce:lettuce-core:[5.0,]",
         "org.latencyutils:LatencyUtils:[2.0.3]",
-        "it.ozimov:embedded-redis:[0.7.3]",
-        PluginITConstants.VERSION, TestcontainersOption.TEST_CONTAINER, TestcontainersOption.MARIADB})
+        PluginITConstants.VERSION, TestcontainersOption.TEST_CONTAINER})
 @SharedTestLifeCycleClass(RedisServer.class)
 public class RedisClient_IT {
     private static final String SERVICE_TYPE_REDIS_LETTUCE = "REDIS_LETTUCE";
 
     private final Logger logger = LogManager.getLogger(getClass());
 
+    private static String host;
     private static int port;
     private static RedisClient redisClient;
 
     @SharedTestBeforeAllResult
     public static void setBeforeAllResult(Properties beforeAllResult) {
         final String value = beforeAllResult.getProperty("PORT");
         port = Integer.parseInt(value);
+        host = beforeAllResult.getProperty("HOST");
+
     }
 
     @BeforeClass
-    public static void beforeClass() throws Exception {
-        redisClient = RedisClient.create("redis://localhost:" + port);
+    public static void beforeClass() {
+        String url = String.format("redis://%s:%s", host, port);
+        redisClient = RedisClient.create(url);
     }
 
     @Test

plugins-it/redis-lettuce-it/src/test/java/com/navercorp/pinpoint/plugin/lettuce/RedisServer.java

@@ -16,34 +16,35 @@
 
 package com.navercorp.pinpoint.plugin.lettuce;
 
-import com.navercorp.pinpoint.pluginit.utils.SocketUtils;
 import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.junit.Assume;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.util.Properties;
 
 public class RedisServer implements SharedTestLifeCycle {
-    private final Logger logger = LogManager.getLogger(getClass());
-
-    private redis.embedded.RedisServer redisServer;
+    private GenericContainer<?> redis;
 
     @Override
     public Properties beforeAll() {
-        final int port = SocketUtils.findAvailableTcpPort(1000, 2000);
-        redisServer = new redis.embedded.RedisServer(port);
+        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
 
-        redisServer.start();
+        this.redis = new GenericContainer<>(DockerImageName.parse("redis:5.0.14-alpine"))
+                        .withExposedPorts(6379);
+        redis.start();
 
         Properties properties = new Properties();
-        properties.setProperty("PORT", String.valueOf(port));
+        properties.setProperty("HOST", redis.getHost());
+        properties.setProperty("PORT", String.valueOf(redis.getMappedPort(6379)));
         return properties;
     }
 
     @Override
     public void afterAll() {
-        if (redisServer != null) {
-            redisServer.stop();
+        if (redis != null) {
+            redis.close();
         }
     }
 }