Update tests for Jedis 5 (#3382)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml

@@ -44,4 +44,18 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java

@@ -29,7 +29,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class Jedis4InstrumentationIT extends Jedis1InstrumentationIT {
+public class Jedis4InstrumentationIT extends Jedis1InstrumentationIT {
     private JedisSharding shardedJedis;
     private UnifiedJedis binaryJedis;
 
@@ -50,6 +50,10 @@ void testShardedJedis() {
         shardedJedis.set("foo", "bar");
         assertThat(shardedJedis.get("foo".getBytes())).isEqualTo("bar".getBytes());
 
+        verifyShardedJedisSpan();
+    }
+
+    protected void verifyShardedJedisSpan() {
         assertTransactionWithRedisSpans("CLIENT", "CLIENT", "SET", "GET");
     }
 

apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/pom.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>apm-redis-plugin</artifactId>
+        <groupId>co.elastic.apm</groupId>
+        <version>1.43.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>apm-jedis-5-tests</artifactId>
+    <name>${project.groupId}:${project.artifactId}</name>
+
+    <properties>
+        <apm-agent-parent.base.dir>${project.basedir}/../../..</apm-agent-parent.base.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>apm-redis-common</artifactId>
+            <type>test-jar</type>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>apm-jedis-plugin</artifactId>
+            <type>test-jar</type>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>apm-jedis-4-plugin</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>apm-jedis-4-plugin</artifactId>
+            <type>test-jar</type>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>5.0.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/src/test/java/jedis/Jedis5InstrumentationIT.java

@@ -0,0 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package jedis;
+
+import co.elastic.apm.agent.jedis.Jedis4InstrumentationIT;
+
+public class Jedis5InstrumentationIT extends Jedis4InstrumentationIT {
+
+    @Override
+    protected void verifyShardedJedisSpan() {
+        assertTransactionWithRedisSpans("CLIENT", "CLIENT", "CLIENT", "CLIENT", "SET", "GET");
+    }
+
+    @Override
+    protected void verifyBasicJedisSpans() {
+        assertTransactionWithRedisSpans( "CLIENT", "CLIENT", "SET", "GET");
+    }
+}

apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis1InstrumentationIT.java

@@ -55,6 +55,10 @@ void testJedis() {
         jedis.set("foo", "bar");
         assertThat(jedis.get("foo".getBytes())).isEqualTo("bar".getBytes());
 
+        verifyBasicJedisSpans();
+    }
+
+    protected void verifyBasicJedisSpans() {
         assertTransactionWithRedisSpans("SET", "GET");
     }
 

apm-agent-plugins/apm-redis-plugin/pom.xml

@@ -20,6 +20,7 @@
         <module>apm-jedis-2-tests</module>
         <module>apm-jedis-3-tests</module>
         <module>apm-jedis-4-plugin</module>
+        <module>apm-jedis-5-tests</module>
         <module>apm-jedis-plugin</module>
         <module>apm-lettuce-3-tests</module>
         <module>apm-lettuce-plugin</module>

docs/supported-technologies.asciidoc

@@ -254,9 +254,9 @@ Other Servlet 3+ compliant servers will most likely work as well.
 |1.9.0
 
 |Redis Jedis
-|1.4.0-4.x
+|1.4.0-5.x
 |The agent creates spans for interactions with the Jedis client.
-|1.10.0, 4.x since 1.31.0
+|1.10.0, 4+ since 1.31.0
 
 |Redis Lettuce
 |3.4+