diff --git a/dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle b/dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle index 6d20593b1d..3f6de12dfc 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle +++ b/dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle @@ -1,12 +1,9 @@ -apply plugin: 'version-scan' - -versionScan { - group = "com.netflix.hystrix" - module = 'hystrix-core' - versions = "[1.4.0,)" - verifyPresent = [ - "com.netflix.hystrix.AbstractCommand": null, - ] +muzzle { + pass { + group = "com.netflix.hystrix" + module = 'hystrix-core' + versions = "[1.4.0,)" + } } apply from: "${rootDir}/gradle/java.gradle" diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java index cb7c609f51..3518b38213 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java +++ b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java @@ -1,6 +1,5 @@ package datadog.trace.instrumentation.hystrix; -import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; @@ -29,11 +28,6 @@ public class HystrixThreadPoolInstrumentation extends Instrumenter.Default { "com.netflix.hystrix.strategy.concurrency.HystrixContextScheduler$ThreadPoolWorker"); } - @Override - public ElementMatcher classLoaderMatcher() { - return classLoaderHasClasses("com.netflix.hystrix.AbstractCommand"); - } - @Override public Map transformers() { final Map transformers = new HashMap<>();