Bump redis.clients:jedis from 1.4.0 to 5.1.2 (#3639)

* Bump redis.clients:jedis from 1.4.0 to 5.1.2 Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 1.4.0 to 5.1.2. - [Release notes](https://github.com/redis/jedis/releases) - [Commits](redis/jedis@jedis-1.4.0...v5.1.2) --- updated-dependencies: - dependency-name: redis.clients:jedis dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update pom.xml * Update pom.xml * Update pom.xml * Update pom.xml * Fix tests * Fix invalid extracted method --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonas Kunz <[email protected]>
elastic · May 23, 2024 · 6ed1852 · 6ed1852
1 parent 098ee3c
commit 6ed1852
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.../apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java b/.../apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java
@@ -62,6 +62,10 @@ void testBinaryJedis() {
         binaryJedis.set("foo".getBytes(), "bar".getBytes());
         assertThat(binaryJedis.get("foo".getBytes())).isEqualTo("bar".getBytes());
 
+        verifyBinaryJedisSpans();
+    }
+
+    protected void verifyBinaryJedisSpans() {
         assertTransactionWithRedisSpans("CLIENT", "CLIENT", "SET", "GET");
     }
 }
diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/...ugins/apm-redis-plugin/apm-jedis-5-tests/src/test/java/jedis/Jedis5InstrumentationIT.java b/...ugins/apm-redis-plugin/apm-jedis-5-tests/src/test/java/jedis/Jedis5InstrumentationIT.java
@@ -24,11 +24,16 @@ public class Jedis5InstrumentationIT extends Jedis4InstrumentationIT {
 
     @Override
     protected void verifyShardedJedisSpan() {
-        assertTransactionWithRedisSpans("CLIENT", "CLIENT", "CLIENT", "CLIENT", "SET", "GET");
+        assertTransactionWithRedisSpans("CLIENT", "CLIENT", "PING", "SET", "GET");
     }
 
     @Override
     protected void verifyBasicJedisSpans() {
-        assertTransactionWithRedisSpans( "CLIENT", "CLIENT", "SET", "GET");
+        assertTransactionWithRedisSpans("CLIENT", "CLIENT", "PING", "SET", "GET");
+    }
+
+    @Override
+    protected void verifyBinaryJedisSpans() {
+        assertTransactionWithRedisSpans("CLIENT", "CLIENT", "PING", "CLIENT", "CLIENT", "SET", "GET");
     }
 }