From bd64965557ab9c702722e37b2f7aa6123a29a625 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 17:12:25 +0000 Subject: [PATCH 1/7] 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](https://github.com/redis/jedis/compare/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] --- apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml | 2 +- apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml | 2 +- apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml | 2 +- apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/pom.xml | 2 +- apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml index a331399344..6476ae7900 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml +++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml @@ -39,7 +39,7 @@ redis.clients jedis - 2.10.2 + 5.1.2 test diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml index 5db12398d8..f0e979840c 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml +++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml @@ -46,7 +46,7 @@ redis.clients jedis - 3.9.0 + 5.1.2 test diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml index 0e78468bca..83f9c27b65 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml +++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml @@ -39,7 +39,7 @@ redis.clients jedis - 4.4.3 + 5.1.2 provided 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 index 1632f4329f..7c4c032efc 100644 --- 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 @@ redis.clients jedis - 5.1.0 + 5.1.2 test diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml index aae0052a15..29387ad2e9 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml +++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml @@ -32,7 +32,7 @@ redis.clients jedis - 1.4.0 + 5.1.2 provided From f889733d236c788b3d8cda616b2991b97ed46fad Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Wed, 22 May 2024 14:58:26 +0200 Subject: [PATCH 2/7] Update pom.xml --- apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml index 6476ae7900..a331399344 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml +++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/pom.xml @@ -39,7 +39,7 @@ redis.clients jedis - 5.1.2 + 2.10.2 test From d6ea0b0b89b25e625b5ec6c3d2dad887d0d23c1e Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Wed, 22 May 2024 14:58:47 +0200 Subject: [PATCH 3/7] Update pom.xml --- apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml index f0e979840c..5db12398d8 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml +++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/pom.xml @@ -46,7 +46,7 @@ redis.clients jedis - 5.1.2 + 3.9.0 test From bc7687b524fc8be59253b40a56c0eb7730f591c1 Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Wed, 22 May 2024 14:59:13 +0200 Subject: [PATCH 4/7] Update pom.xml --- apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml index 83f9c27b65..0e78468bca 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml +++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/pom.xml @@ -39,7 +39,7 @@ redis.clients jedis - 5.1.2 + 4.4.3 provided From 44e40b1611aac62d6d86af3660c14a3e97af8aba Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Wed, 22 May 2024 14:59:32 +0200 Subject: [PATCH 5/7] Update pom.xml --- apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml b/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml index 29387ad2e9..aae0052a15 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml +++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/pom.xml @@ -32,7 +32,7 @@ redis.clients jedis - 5.1.2 + 1.4.0 provided From 75b95a0de0dbde10da21ffb3abb0c6cfdf1521f4 Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Thu, 23 May 2024 09:51:55 +0200 Subject: [PATCH 6/7] Fix tests --- .../elastic/apm/agent/jedis/Jedis4InstrumentationIT.java | 6 +++++- .../src/test/java/jedis/Jedis5InstrumentationIT.java | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java index 7fb48eb2b4..7814b5f7ff 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java +++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java @@ -54,7 +54,7 @@ void testShardedJedis() { } protected void verifyShardedJedisSpan() { - assertTransactionWithRedisSpans("CLIENT", "CLIENT", "SET", "GET"); + verifyBinaryJedisSpans(); } @Test @@ -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/src/test/java/jedis/Jedis5InstrumentationIT.java b/apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/src/test/java/jedis/Jedis5InstrumentationIT.java index dc5ba27cb3..7c4c4ee045 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/src/test/java/jedis/Jedis5InstrumentationIT.java +++ b/apm-agent-plugins/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"); } } From 335df3e5d92ba604e9b49d5e1cf56e464ca817a0 Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Thu, 23 May 2024 10:28:05 +0200 Subject: [PATCH 7/7] Fix invalid extracted method --- .../co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java index 7814b5f7ff..5cadc5d327 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java +++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java @@ -54,7 +54,7 @@ void testShardedJedis() { } protected void verifyShardedJedisSpan() { - verifyBinaryJedisSpans(); + assertTransactionWithRedisSpans("CLIENT", "CLIENT", "SET", "GET"); } @Test