Skip to content

Commit 6ed1852

Browse files
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]>
1 parent 098ee3c commit 6ed1852

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ void testBinaryJedis() {
6262
binaryJedis.set("foo".getBytes(), "bar".getBytes());
6363
assertThat(binaryJedis.get("foo".getBytes())).isEqualTo("bar".getBytes());
6464

65+
verifyBinaryJedisSpans();
66+
}
67+
68+
protected void verifyBinaryJedisSpans() {
6569
assertTransactionWithRedisSpans("CLIENT", "CLIENT", "SET", "GET");
6670
}
6771
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>redis.clients</groupId>
4848
<artifactId>jedis</artifactId>
49-
<version>5.1.0</version>
49+
<version>5.1.2</version>
5050
<scope>test</scope>
5151
</dependency>
5252
</dependencies>

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,16 @@ public class Jedis5InstrumentationIT extends Jedis4InstrumentationIT {
2424

2525
@Override
2626
protected void verifyShardedJedisSpan() {
27-
assertTransactionWithRedisSpans("CLIENT", "CLIENT", "CLIENT", "CLIENT", "SET", "GET");
27+
assertTransactionWithRedisSpans("CLIENT", "CLIENT", "PING", "SET", "GET");
2828
}
2929

3030
@Override
3131
protected void verifyBasicJedisSpans() {
32-
assertTransactionWithRedisSpans( "CLIENT", "CLIENT", "SET", "GET");
32+
assertTransactionWithRedisSpans("CLIENT", "CLIENT", "PING", "SET", "GET");
33+
}
34+
35+
@Override
36+
protected void verifyBinaryJedisSpans() {
37+
assertTransactionWithRedisSpans("CLIENT", "CLIENT", "PING", "CLIENT", "CLIENT", "SET", "GET");
3338
}
3439
}

0 commit comments

Comments
 (0)