From b693335ef5cb1c7b4eb8589e8b80ab442ce35e4d Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler.benson@datadoghq.com>
Date: Fri, 19 Oct 2018 13:19:50 +1000
Subject: [PATCH] Add routing key to resource name for publish command.

---
 .../amqp/RabbitChannelInstrumentation.java    |  6 +++++-
 .../src/test/groovy/RabbitMQTest.groovy       | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java
index 78f6c59734..c829a4450c 100644
--- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java
+++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java
@@ -147,7 +147,11 @@ public class RabbitChannelInstrumentation extends Instrumenter.Default {
 
       if (span != null) {
         final String exchangeName = exchange == null || exchange.isEmpty() ? "<default>" : exchange;
-        span.setTag(DDTags.RESOURCE_NAME, "basic.publish " + exchangeName);
+        final String routing =
+            routingKey == null || routingKey.isEmpty()
+                ? "<all>"
+                : routingKey.startsWith("amq.gen-") ? "<generated>" : routingKey;
+        span.setTag(DDTags.RESOURCE_NAME, "basic.publish " + exchangeName + " -> " + routing);
         span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.MESSAGE_PRODUCER);
         span.setTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_PRODUCER);
         span.setTag("amqp.exchange", exchange);
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 57a75c6f93..2a65594d5f 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
@@ -108,7 +108,7 @@ class RabbitMQTest extends AgentTestRunner {
           operationName "parent"
         }
         // reverse order
-        rabbitSpan(it, 1, "basic.publish $exchangeName", span(0))
+        rabbitSpan(it, 1, "basic.publish $exchangeName -> $routingKey", span(0))
         rabbitSpan(it, 2, "queue.bind", span(0))
         rabbitSpan(it, 3, "queue.declare", span(0))
         rabbitSpan(it, 4, "exchange.declare", span(0))
@@ -122,10 +122,9 @@ class RabbitMQTest extends AgentTestRunner {
 
   def "test rabbit publish/get default exchange"() {
     setup:
-    String queueName = channel.queueDeclare("some-routing-queue", false, true, true, null).getQueue()
-    String routingKey = queueName
+    String queueName = channel.queueDeclare().getQueue()
 
-    channel.basicPublish("", routingKey, null, "Hello, world!".getBytes())
+    channel.basicPublish("", queueName, null, "Hello, world!".getBytes())
 
     GetResponse response = channel.basicGet(queueName, true)
 
@@ -138,10 +137,10 @@ class RabbitMQTest extends AgentTestRunner {
         rabbitSpan(it, "queue.declare")
       }
       trace(1, 1) {
-        rabbitSpan(it, "basic.publish <default>")
+        rabbitSpan(it, "basic.publish <default> -> <generated>")
       }
       trace(2, 1) {
-        rabbitSpan(it, "basic.get some-routing-queue", TEST_WRITER[1][0])
+        rabbitSpan(it, "basic.get <generated>", TEST_WRITER[1][0])
       }
     }
   }
@@ -195,7 +194,7 @@ class RabbitMQTest extends AgentTestRunner {
         def publishSpan = null
         trace(2 + (it * 2), 1) {
           publishSpan = span(0)
-          rabbitSpan(it, "basic.publish $exchangeName")
+          rabbitSpan(it, "basic.publish $exchangeName -> <all>")
         }
         trace(3 + (it * 2), 1) {
           rabbitSpan(it, resource, publishSpan)
@@ -257,7 +256,7 @@ class RabbitMQTest extends AgentTestRunner {
         rabbitSpan(it, "queue.declare")
       }
       trace(1, 1) {
-        rabbitSpan(it, "basic.publish <default>")
+        rabbitSpan(it, "basic.publish <default> -> some-routing-queue")
       }
       trace(2, 1) {
         rabbitSpan(it, "basic.get $queue.name", TEST_WRITER[1][0])
@@ -297,7 +296,9 @@ class RabbitMQTest extends AgentTestRunner {
             "$DDTags.SPAN_TYPE" DDSpanTypes.MESSAGE_PRODUCER
             "amqp.command" "basic.publish"
             "amqp.exchange" { it == null || it == "some-exchange" }
-            "amqp.routing_key" { it == null || it == "some-routing-key" || it == "some-routing-queue" }
+            "amqp.routing_key" {
+              it == null || it == "some-routing-key" || it == "some-routing-queue" || it.startsWith("amq.gen-")
+            }
             "amqp.delivery_mode" { it == null || it == 2 }
             "message.size" Integer
             break