From 7ece2fe2a65553a66b14d13682430645f2dc05cb Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler.benson@datadoghq.com>
Date: Fri, 19 Oct 2018 10:25:32 +1000
Subject: [PATCH] Prevent exchange name being overwritten in publish resource
 name.

---
 .../amqp/RabbitCommandInstrumentation.java    |  5 ++-
 .../src/test/groovy/RabbitMQTest.groovy       | 36 ++++++++++++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java
index 88c700d951..7c969154ec 100644
--- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java
+++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java
@@ -52,7 +52,10 @@ public class RabbitCommandInstrumentation extends Instrumenter.Default {
       final Method method = command.getMethod();
       if (span != null && method != null) {
         final String name = method.protocolMethodName();
-        span.setTag(DDTags.RESOURCE_NAME, name);
+        if (!name.equals("basic.publish")) {
+          // Don't overwrite the name already set.
+          span.setTag(DDTags.RESOURCE_NAME, name);
+        }
         span.setTag("amqp.command", name);
       }
     }
diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy
index cafab9413f..bab7fc9f6f 100644
--- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy
+++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy
@@ -106,7 +106,7 @@ class RabbitMQTest extends AgentTestRunner {
         rabbitSpan(it, "queue.bind")
       }
       trace(3, 1) {
-        rabbitSpan(it, "basic.publish")
+        rabbitSpan(it, "basic.publish $exchangeName")
       }
       trace(4, 1) {
         rabbitSpan(it, "basic.get <generated>", TEST_WRITER[3][0])
@@ -114,8 +114,34 @@ class RabbitMQTest extends AgentTestRunner {
     }
 
     where:
-    exchangeName = "some-exchange"
-    routingKey = "some-routing-key"
+    exchangeName    | routingKey
+    "some-exchange" | "some-routing-key"
+  }
+
+  def "test rabbit publish/get default exchange"() {
+    setup:
+    String queueName = channel.queueDeclare("some-routing-queue", false, true, true, null).getQueue()
+    String routingKey = queueName
+
+    channel.basicPublish("", routingKey, null, "Hello, world!".getBytes())
+
+    GetResponse response = channel.basicGet(queueName, true)
+
+    expect:
+    new String(response.getBody()) == "Hello, world!"
+
+    and:
+    assertTraces(3) {
+      trace(0, 1) {
+        rabbitSpan(it, "queue.declare")
+      }
+      trace(1, 1) {
+        rabbitSpan(it, "basic.publish <default>")
+      }
+      trace(2, 1) {
+        rabbitSpan(it, "basic.get some-routing-queue", TEST_WRITER[1][0])
+      }
+    }
   }
 
   def "test rabbit consume #messageCount messages"() {
@@ -167,7 +193,7 @@ class RabbitMQTest extends AgentTestRunner {
         def publishSpan = null
         trace(2 + (it * 2), 1) {
           publishSpan = span(0)
-          rabbitSpan(it, "basic.publish")
+          rabbitSpan(it, "basic.publish $exchangeName")
         }
         trace(3 + (it * 2), 1) {
           rabbitSpan(it, resource, publishSpan)
@@ -229,7 +255,7 @@ class RabbitMQTest extends AgentTestRunner {
         rabbitSpan(it, "queue.declare")
       }
       trace(1, 1) {
-        rabbitSpan(it, "basic.publish")
+        rabbitSpan(it, "basic.publish <default>")
       }
       trace(2, 1) {
         rabbitSpan(it, "basic.get $queue.name", TEST_WRITER[1][0])