Merge pull request #509 from DataDog/gary/muzzle-spy-memcached

Muzzle Spymemcached

Author: gary-huang

dd-java-agent/instrumentation/spymemcached-2.12/spymemcached-2.12.gradle

@@ -1,13 +1,12 @@
-apply plugin: 'version-scan'
-
-versionScan {
-  group = "net.spy"
-  module = 'spymemcached'
-  versions = "[1.12.0,)"
-  scanMethods = true
-  verifyPresent = [
-    "net.spy.memcached.ConnectionFactoryBuilder": "setListenerExecutorService",
-  ]
+// building and testing against 2.12 because setListenerExecutorService exists to facilitate easier
+// testing. Instrumentation should work since 2.10
+muzzle {
+  pass {
+    group = "net.spy"
+    module = 'spymemcached'
+    versions = "[2.10.0,)"
+    assertInverse = true
+  }
 }
 
 apply from: "${rootDir}/gradle/java.gradle"

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

@@ -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 ElementMatcher<TypeDescription> typeMatcher() {
     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[] {