Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd64965
Bump redis.clients:jedis from 1.4.0 to 5.1.2
dependabot[bot] May 20, 2024
f889733
Update pom.xml
JonasKunz May 22, 2024
d6ea0b0
Update pom.xml
JonasKunz May 22, 2024
bc7687b
Update pom.xml
JonasKunz May 22, 2024
44e40b1
Update pom.xml
JonasKunz May 22, 2024
75b95a0
Fix tests
JonasKunz May 23, 2024
335df3e
Fix invalid extracted method
JonasKunz May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .../apm-jedis-4-plugin/src/test/java/co/elastic/apm/agent/jedis/Jedis4InstrumentationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-redis-plugin/apm-jedis-5-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 7 additions & 2 deletions ...ugins/apm-redis-plugin/apm-jedis-5-tests/src/test/java/jedis/Jedis5InstrumentationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}