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 #726 from blockmar/hystrix-tags 

Hystrix metadata added to tags and Command Group included in resource name
This commit is contained in:
Tyler Benson 2019-02-26 08:05:56 -08:00 committed by GitHub
parent 6215ca1093 8d601b7f0d
commit 0aba752787
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ testSets {
}
dependencies {
// compileOnly group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.5.12'
compileOnly group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling')

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

@ -9,13 +9,13 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.not;
import com.google.auto.service.AutoService;
import com.netflix.hystrix.HystrixCommand;
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDTags;
import io.opentracing.Scope;
import io.opentracing.Span;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.Map;
import net.bytebuddy.asm.Advice;
@ -48,24 +48,23 @@ public class HystrixCommandInstrumentation extends Instrumenter.Default {
public static class TraceAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static Scope startSpan(@Advice.Origin final Method method) {
final Class<?> declaringClass = method.getDeclaringClass();
String className = declaringClass.getSimpleName();
if (className.isEmpty()) {
className = declaringClass.getName();
if (declaringClass.getPackage() != null) {
final String pkgName = declaringClass.getPackage().getName();
if (!pkgName.isEmpty()) {
className = declaringClass.getName().replace(pkgName, "").substring(1);
}
}
}
final String resourceName = className + "." + method.getName();
public static Scope startSpan(
@Advice.This final HystrixCommand<?> command,
@Advice.Origin("#m") final String methodName) {
final String commandName = command.getCommandKey().name();
final String groupName = command.getCommandGroup().name();
final boolean circuitOpen = command.isCircuitBreakerOpen();
final String resourceName = groupName + "." + commandName + "." + methodName;
return GlobalTracer.get()
.buildSpan(OPERATION_NAME)
.withTag(DDTags.RESOURCE_NAME, resourceName)
.withTag(Tags.COMPONENT.getKey(), "hystrix")
.withTag("hystrix.command", commandName)
.withTag("hystrix.group", groupName)
.withTag("hystrix.circuit-open", circuitOpen)
.startActive(true);
}

15
dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy
View File

@ -52,11 +52,14 @@ class HystrixTest extends AgentTestRunner {
span(1) {
serviceName "unnamed-java-app"
operationName "hystrix.cmd"
resourceName "HystrixTest\$1.run"
resourceName "ExampleGroup.HystrixTest\$1.run"
spanType null
childOf span(0)
errored false
tags {
"hystrix.command" "HystrixTest\$1"
"hystrix.group" "ExampleGroup"
"hystrix.circuit-open" false
"$Tags.COMPONENT.key" "hystrix"
defaultTags()
}
@ -126,11 +129,14 @@ class HystrixTest extends AgentTestRunner {
span(1) {
serviceName "unnamed-java-app"
operationName "hystrix.cmd"
resourceName "HystrixTest\$2.getFallback"
resourceName "ExampleGroup.HystrixTest\$2.getFallback"
spanType null
childOf span(0)
errored false
tags {
"hystrix.command" "HystrixTest\$2"
"hystrix.group" "ExampleGroup"
"hystrix.circuit-open" false
"$Tags.COMPONENT.key" "hystrix"
defaultTags()
}
@ -138,11 +144,14 @@ class HystrixTest extends AgentTestRunner {
span(2) {
serviceName "unnamed-java-app"
operationName "hystrix.cmd"
resourceName "HystrixTest\$2.run"
resourceName "ExampleGroup.HystrixTest\$2.run"
spanType null
childOf span(0)
errored true
tags {
"hystrix.command" "HystrixTest\$2"
"hystrix.group" "ExampleGroup"
"hystrix.circuit-open" false
"$Tags.COMPONENT.key" "hystrix"
errorTags(IllegalArgumentException)
defaultTags()