From 50c2af9abb6ac565aa57d06ddc158b824a62b021 Mon Sep 17 00:00:00 2001
From: Gary <garyhuang@hotmail.ca>
Date: Fri, 9 Nov 2018 11:46:55 -0500
Subject: [PATCH] remove classloader matcher

---
 .../muzzle/MuzzleVersionScanPlugin.java       |  1 -
 .../RatpackHttpClientInstrumentation.java     |  6 ------
 .../ratpack/RatpackInstrumentation.java       | 20 -------------------
 3 files changed, 27 deletions(-)

diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java
index f08b262008..fdc392e67d 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java
@@ -3,7 +3,6 @@ package datadog.trace.agent.tooling.muzzle;
 import datadog.trace.agent.tooling.HelperInjector;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.WeakMap;
-
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
diff --git a/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java
index 856049aed7..cc067331a6 100644
--- a/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java
@@ -1,7 +1,6 @@
 package datadog.trace.instrumentation.ratpack;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.instrumentation.ratpack.RatpackInstrumentation.CLASSLOADER_CONTAINS_RATPACK_1_4_OR_ABOVE;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.not;
@@ -38,11 +37,6 @@ public final class RatpackHttpClientInstrumentation extends Instrumenter.Default
     return not(isInterface()).and(safeHasSuperType(named("ratpack.http.client.HttpClient")));
   }
 
-  @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    return CLASSLOADER_CONTAINS_RATPACK_1_4_OR_ABOVE;
-  }
-
   @Override
   public String[] helperClassNames() {
     return new String[] {
diff --git a/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackInstrumentation.java
index d4eb2c91af..ba95eb18ba 100644
--- a/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackInstrumentation.java
+++ b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackInstrumentation.java
@@ -1,7 +1,6 @@
 package datadog.trace.instrumentation.ratpack;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClassWithMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isStatic;
@@ -29,10 +28,6 @@ public final class RatpackInstrumentation extends Instrumenter.Default {
   static final TypeDescription.Latent ACTION_TYPE_DESCRIPTION =
       new TypeDescription.Latent("ratpack.func.Action", Modifier.PUBLIC, null);
 
-  static final ElementMatcher.Junction.AbstractBase<ClassLoader>
-      CLASSLOADER_CONTAINS_RATPACK_1_4_OR_ABOVE =
-          classLoaderHasClassWithMethod("ratpack.path.PathBinding", "getDescription");
-
   public RatpackInstrumentation() {
     super(EXEC_NAME);
   }
@@ -47,11 +42,6 @@ public final class RatpackInstrumentation extends Instrumenter.Default {
     return named("ratpack.server.internal.ServerRegistry");
   }
 
-  @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    return CLASSLOADER_CONTAINS_RATPACK_1_4_OR_ABOVE;
-  }
-
   @Override
   public String[] helperClassNames() {
     return new String[] {
@@ -89,11 +79,6 @@ public final class RatpackInstrumentation extends Instrumenter.Default {
       return not(isInterface()).and(safeHasSuperType(named("ratpack.exec.ExecStarter")));
     }
 
-    @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      return CLASSLOADER_CONTAINS_RATPACK_1_4_OR_ABOVE;
-    }
-
     @Override
     public String[] helperClassNames() {
       return new String[] {
@@ -131,11 +116,6 @@ public final class RatpackInstrumentation extends Instrumenter.Default {
           .or(not(isInterface()).and(safeHasSuperType(named("ratpack.exec.Execution"))));
     }
 
-    @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      return CLASSLOADER_CONTAINS_RATPACK_1_4_OR_ABOVE;
-    }
-
     @Override
     public String[] helperClassNames() {
       return new String[] {