It actually isn’t compatable until 1.4

This commit is contained in:
Tyler Benson 2018-05-04 12:08:11 +10:00
parent 2561e72824
commit 660dfc834c
5 changed files with 6 additions and 6 deletions

View File

@ -3,10 +3,9 @@ apply plugin: 'version-scan'
versionScan {
group = "com.netflix.hystrix"
module = 'hystrix-core'
versions = "[1.3.15,)"
scanMethods = true
versions = "[1.4.0,)"
verifyPresent = [
"com.netflix.hystrix.strategy.concurrency.HystrixContextScheduler\$ThreadPoolWorker": "schedule",
"com.netflix.hystrix.AbstractCommand": null,
]
}

View File

@ -1,5 +1,6 @@
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;
@ -31,8 +32,8 @@ public class HystrixThreadPoolInstrumentation extends Instrumenter.Configurable
return agentBuilder
.type(
named(
"com.netflix.hystrix.strategy.concurrency.HystrixContextScheduler$ThreadPoolWorker"))
// Not adding check for classes on the classpath because this is the only class we need.
"com.netflix.hystrix.strategy.concurrency.HystrixContextScheduler$ThreadPoolWorker"),
classLoaderHasClasses("com.netflix.hystrix.AbstractCommand"))
.transform(DDTransformers.defaultTransformers())
.transform(
DDAdvice.create()

View File

@ -13,7 +13,7 @@ include ':dd-java-agent:instrumentation:apache-httpclient-4.3'
include ':dd-java-agent:instrumentation:aws-sdk'
include ':dd-java-agent:instrumentation:classloaders'
include ':dd-java-agent:instrumentation:datastax-cassandra-3.2'
include ':dd-java-agent:instrumentation:hystrix-1.3.15'
include ':dd-java-agent:instrumentation:hystrix-1.4'
include ':dd-java-agent:instrumentation:jax-rs-annotations'
include ':dd-java-agent:instrumentation:jax-rs-client'
include ':dd-java-agent:instrumentation:java-concurrent'