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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dd-java-agent/instrumentation/spymemcached-2.12/spymemcached-2.12.gradle
View File

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

10
dd-java-agent/instrumentation/spymemcached-2.12/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java
View File

@ -1,6 +1,5 @@
package datadog.trace.instrumentation.spymemcached; 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.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -38,15 +37,6 @@ public final class MemcachedClientInstrumentation extends Instrumenter.Default {
return named(MEMCACHED_PACKAGE + ".MemcachedClient"); 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 @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return new String[] { return new String[] {