Muzzle Spymemcached

Add muzzle block and remove class loader matcher method.
This commit is contained in:
Qiyang Huang 2018-09-19 14:37:25 -04:00
parent 7eaf069e45
commit 347002c0f6
2 changed files with 7 additions and 20 deletions

View File

@ -1,13 +1,10 @@
apply plugin: 'version-scan'
versionScan {
muzzle {
pass {
group = "net.spy"
module = 'spymemcached'
versions = "[1.12.0,)"
scanMethods = true
verifyPresent = [
"net.spy.memcached.ConnectionFactoryBuilder": "setListenerExecutorService",
]
versions = "[2.10.0,)"
assertInverse = true
}
}
apply from: "${rootDir}/gradle/java.gradle"

View File

@ -1,6 +1,5 @@
package datadog.trace.instrumentation.spymemcached;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClassWithMethod;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named;
@ -38,15 +37,6 @@ public final class MemcachedClientInstrumentation extends Instrumenter.Default {
return named(MEMCACHED_PACKAGE + ".MemcachedClient");
}
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
// Target 2.12 that has this method
return classLoaderHasClassWithMethod(
MEMCACHED_PACKAGE + ".ConnectionFactoryBuilder",
"setListenerExecutorService",
"java.util.concurrent.ExecutorService");
}
@Override
public String[] helperClassNames() {
return new String[] {