From 24f01c6b5c9a4d31d45bd666df947e165c8ae248 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Tue, 2 Nov 2021 20:33:18 +0200 Subject: [PATCH] Fix jeddis muzzle failure (#4570) --- instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts | 1 + .../jedis/v3_0/JedisInstrumentationModule.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts index c105377128..12e994ba64 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts @@ -21,6 +21,7 @@ dependencies { // ensures jedis-1.4 instrumentation does not load with jedis 3.0+ by failing // the tests in the event it does. The tests will end up with double spans testInstrumentation(project(":instrumentation:jedis:jedis-1.4:javaagent")) + testInstrumentation(project(":instrumentation:jedis:jedis-4.0:javaagent")) latestDepTestLibrary("redis.clients:jedis:3.+") } diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java index c76d5b4f41..d5c151ef8e 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java @@ -24,7 +24,10 @@ public class JedisInstrumentationModule extends InstrumentationModule { @Override public ElementMatcher.Junction classLoaderMatcher() { - return not(hasClassesNamed("redis.clients.jedis.CommandArguments")); + // missing in 2.x + return hasClassesNamed("redis.clients.jedis.commands.BasicCommands") + // added in 4.0 + .and(not(hasClassesNamed("redis.clients.jedis.CommandArguments"))); } @Override