diff --git a/dd-java-agent/instrumentation/jedis-1.4/jedis-1.4.gradle b/dd-java-agent/instrumentation/jedis-1.4/jedis-1.4.gradle index a3f451170e..459a688e75 100644 --- a/dd-java-agent/instrumentation/jedis-1.4/jedis-1.4.gradle +++ b/dd-java-agent/instrumentation/jedis-1.4/jedis-1.4.gradle @@ -3,8 +3,8 @@ muzzle { group = "redis.clients" module = "jedis" versions = "[1.4.0,3.0.0)" - assertInverse = true } + // Muzzle doesn't detect the classLoaderMatcher, so we can't assert fail for 3.0+ } apply from: "${rootDir}/gradle/java.gradle" diff --git a/dd-java-agent/instrumentation/jedis-3.0/jedis-3.0.gradle b/dd-java-agent/instrumentation/jedis-3.0/jedis-3.0.gradle index c191247c7f..947b2a9aa6 100644 --- a/dd-java-agent/instrumentation/jedis-3.0/jedis-3.0.gradle +++ b/dd-java-agent/instrumentation/jedis-3.0/jedis-3.0.gradle @@ -27,6 +27,9 @@ dependencies { testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' testCompile group: 'redis.clients', name: 'jedis', version: '3.0.0' + // 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 + testCompile project(':dd-java-agent:instrumentation:jedis-1.4') latestDepTestCompile group: 'redis.clients', name: 'jedis', version: '3.+' }