From b53514c4589450714c4233ad5844c531f20a89ec Mon Sep 17 00:00:00 2001
From: Gary Huang <garyhuang@hotmail.ca>
Date: Fri, 7 Sep 2018 16:47:00 -0400
Subject: [PATCH] Muzzle Jedis Instrumentation

Add muzzle block and remove class loader matcher method.
---
 .../instrumentation/jedis-1.4/jedis-1.4.gradle  | 17 +++++++----------
 .../jedis/JedisInstrumentation.java             |  6 ------
 2 files changed, 7 insertions(+), 16 deletions(-)

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 a8c40ffd52..0bc34e6c04 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
@@ -1,13 +1,10 @@
-apply plugin: 'version-scan'
-
-versionScan {
-  group = "redis.clients"
-  module = "jedis"
-  versions = "[1.4.0,)"
-  legacyModule = "jms-api"
-  verifyPresent = [
-    'redis.clients.jedis.Protocol$Command': null,
-  ]
+muzzle {
+  pass {
+    group = "redis.clients"
+    module = "jedis"
+    versions = "[1.4.0,)"
+    assertInverse = true
+  }
 }
 
 apply from: "${rootDir}/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java
index dd9423a486..bd9aa7cff2 100644
--- a/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java
+++ b/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java
@@ -1,6 +1,5 @@
 package datadog.trace.instrumentation.jedis;
 
-import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
 import static io.opentracing.log.Fields.ERROR_OBJECT;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
@@ -38,11 +37,6 @@ public final class JedisInstrumentation extends Instrumenter.Default {
     return named("redis.clients.jedis.Protocol");
   }
 
-  @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    return classLoaderHasClasses("redis.clients.jedis.Protocol$Command");
-  }
-
   @Override
   public String[] helperClassNames() {
     return new String[] {};