From a44b59bb14f50153552971b4043c90bb9c9ff06d Mon Sep 17 00:00:00 2001
From: Will Gittoes <will.gittoes@datadoghq.com>
Date: Thu, 31 Jan 2019 14:30:08 +1100
Subject: [PATCH] Hard-code Hystrix operation (span) name, leaving the resource
 name dynamic

---
 .../hystrix/HystrixCommandInstrumentation.java              | 6 +++++-
 .../hystrix-1.4/src/test/groovy/HystrixTest.groovy          | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java
index 23a0048236..2de02c0411 100644
--- a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java
+++ b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java
@@ -10,6 +10,7 @@ import static net.bytebuddy.matcher.ElementMatchers.not;
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.api.DDTags;
 import io.opentracing.Scope;
 import io.opentracing.Span;
 import io.opentracing.tag.Tags;
@@ -25,6 +26,8 @@ import net.bytebuddy.matcher.ElementMatcher;
 @AutoService(Instrumenter.class)
 public class HystrixCommandInstrumentation extends Instrumenter.Default {
 
+  private static final String operationName = "hystrix.cmd";
+
   public HystrixCommandInstrumentation() {
     super("hystrix");
   }
@@ -57,10 +60,11 @@ public class HystrixCommandInstrumentation extends Instrumenter.Default {
           }
         }
       }
-      final String operationName = className + "." + method.getName();
+      final String resourceName = className + "." + method.getName();
 
       return GlobalTracer.get()
           .buildSpan(operationName)
+          .withTag(DDTags.RESOURCE_NAME, resourceName)
           .withTag(Tags.COMPONENT.getKey(), "hystrix")
           .startActive(true);
     }
diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy
index 0ed7809d62..95ff8b4a0e 100644
--- a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy
+++ b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy
@@ -51,7 +51,7 @@ class HystrixTest extends AgentTestRunner {
         }
         span(1) {
           serviceName "unnamed-java-app"
-          operationName "HystrixTest\$1.run"
+          operationName "hystrix.cmd"
           resourceName "HystrixTest\$1.run"
           spanType null
           childOf span(0)
@@ -125,7 +125,7 @@ class HystrixTest extends AgentTestRunner {
         }
         span(1) {
           serviceName "unnamed-java-app"
-          operationName "HystrixTest\$2.getFallback"
+          operationName "hystrix.cmd"
           resourceName "HystrixTest\$2.getFallback"
           spanType null
           childOf span(0)
@@ -137,7 +137,7 @@ class HystrixTest extends AgentTestRunner {
         }
         span(2) {
           serviceName "unnamed-java-app"
-          operationName "HystrixTest\$2.run"
+          operationName "hystrix.cmd"
           resourceName "HystrixTest\$2.run"
           spanType null
           childOf span(0)