open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Work around muzzle feature missing

This commit is contained in:
Brian Devins-Suresh 2019-12-06 14:12:46 -05:00
parent c72f2d3b45
commit c7329e4b6b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/instrumentation/jedis-1.4/jedis-1.4.gradle
View File

@ -3,8 +3,8 @@ muzzle {
group = "redis.clients" group = "redis.clients"
module = "jedis" module = "jedis"
versions = "[1.4.0,3.0.0)" 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" apply from: "${rootDir}/gradle/java.gradle"

3
dd-java-agent/instrumentation/jedis-3.0/jedis-3.0.gradle
View File

@ -27,6 +27,9 @@ dependencies {
testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
testCompile group: 'redis.clients', name: 'jedis', version: '3.0.0' 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.+' latestDepTestCompile group: 'redis.clients', name: 'jedis', version: '3.+'
} }