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

Merge pull request #491 from DataDog/gary/muzzle-hystrix 

Muzzle Hystrix Instrumentation
This commit is contained in:
Gary Huang 2018-09-10 20:00:20 -04:00 committed by GitHub
parent 9c1b641069 05356cc1f5
commit d7b87c07d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle
View File

@ -1,12 +1,9 @@
apply plugin: 'version-scan' muzzle {
pass {
versionScan {
group = "com.netflix.hystrix" group = "com.netflix.hystrix"
module = 'hystrix-core' module = 'hystrix-core'
versions = "[1.4.0,)" versions = "[1.4.0,)"
verifyPresent = [ }
"com.netflix.hystrix.AbstractCommand": null,
]
} }
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"

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

@ -1,6 +1,5 @@
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;
@ -29,11 +28,6 @@ public class HystrixThreadPoolInstrumentation extends Instrumenter.Default {
"com.netflix.hystrix.strategy.concurrency.HystrixContextScheduler$ThreadPoolWorker"); "com.netflix.hystrix.strategy.concurrency.HystrixContextScheduler$ThreadPoolWorker");
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("com.netflix.hystrix.AbstractCommand");
}
@Override @Override
public Map<ElementMatcher, String> transformers() { public Map<ElementMatcher, String> transformers() {
final Map<ElementMatcher, String> transformers = new HashMap<>(); final Map<ElementMatcher, String> transformers = new HashMap<>();