open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dd-java-agent/instrumentation/hystrix-1.3.15/hystrix-1.3.15.gradle → dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle
View File

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

0
dd-java-agent/instrumentation/hystrix-1.3.15/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java → dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java
View File

5
dd-java-agent/instrumentation/hystrix-1.3.15/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java → dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java
View File

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

0
dd-java-agent/instrumentation/hystrix-1.3.15/src/test/groovy/HystrixTest.groovy → dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy
View File

2
settings.gradle
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:aws-sdk'
include ':dd-java-agent:instrumentation:classloaders' include ':dd-java-agent:instrumentation:classloaders'
include ':dd-java-agent:instrumentation:datastax-cassandra-3.2' 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-annotations'
include ':dd-java-agent:instrumentation:jax-rs-client' include ':dd-java-agent:instrumentation:jax-rs-client'
include ':dd-java-agent:instrumentation:java-concurrent' include ':dd-java-agent:instrumentation:java-concurrent'