address PR comments - add the same logic to the sender side

Author: deni-topalova

apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-plugin/src/main/java/co/elastic/apm/agent/rabbitmq/ChannelInstrumentation.java

@@ -24,6 +24,7 @@
 import co.elastic.apm.agent.sdk.ElasticApmInstrumentation;
 import co.elastic.apm.agent.tracer.ElasticContext;
 import co.elastic.apm.agent.tracer.Span;
+import co.elastic.apm.agent.tracer.configuration.MessagingConfiguration;
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
@@ -137,10 +138,9 @@ public static Object[] onBasicPublish(@Advice.This Channel channel,
                 if (exitSpan != null) {
 
                     exchange = normalizeExchangeName(exchange);
-
+                    String transactionNameSuffix = normalizeExchangeName(resolveTransactionNameSuffix(exchange, routingKey));
                     exitSpan.withAction("send")
-                        .withName("RabbitMQ SEND to ").appendToName(exchange);
-
+                        .withName("RabbitMQ SEND to ").appendToName(transactionNameSuffix);
                 }
 
                 properties = propagateTraceContext(tracer.currentContext(), properties);
@@ -174,6 +174,15 @@ private static AMQP.BasicProperties propagateTraceContext(ElasticContext<?> toPr
                 return properties.builder().headers(headersWithContext).build();
             }
 
+            private static String resolveTransactionNameSuffix(String exchange, String routingKey) {
+
+                if (MessagingConfiguration.RabbitMQNamingMode.ROUTING_KEY == AbstractBaseInstrumentation.getRabbitMQNamingMode()) {
+                    return routingKey;
+                } else {
+                    return exchange;
+                }
+            }
+
             @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
             public static void afterBasicPublish(@Advice.Enter @Nullable Object[] enterArray,
                                                  @Advice.Thrown @Nullable Throwable throwable) {

apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-plugin/src/test/java/co/elastic/apm/agent/rabbitmq/RabbitMQIT.java

@@ -316,7 +316,7 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp
         checkTransaction(childTransaction, exchange, transactionNameSuffix, "RabbitMQ");
 
         Span span = getReporter().getSpans().get(0);
-        checkSendSpan(span, exchange);
+        checkSendSpan(span, exchange, transactionNameSuffix);
 
         // span should be child of the first transaction
         checkParentChild(rootTransaction, span);
@@ -706,14 +706,23 @@ private static HashMap<String, String> getHeadersMap(Message message) {
     }
 
     private static void checkSendSpan(Span span, String exchange) {
-        checkSendSpan(span, exchange, connection.getAddress().getHostAddress(), connection.getPort());
+        checkSendSpan(span, exchange, exchange, connection.getAddress().getHostAddress(), connection.getPort());
+    }
+
+    private static void checkSendSpan(Span span, String exchange, String spanNameSuffix) {
+        checkSendSpan(span, exchange, spanNameSuffix, connection.getAddress().getHostAddress(), connection.getPort());
     }
 
     static void checkSendSpan(Span span, String exchange, String host, int port) {
+        checkSendSpan(span, exchange, exchange, host, port);
+    }
+
+    static void checkSendSpan(Span span, String exchange, String spanNameSuffix, String host, int port) {
         String exchangeName = exchange.isEmpty() ? "<default>" : exchange;
+        String spanName = spanNameSuffix.isEmpty() ? "<default>" : spanNameSuffix;
         checkSpanCommon(span,
             "send",
-            String.format("RabbitMQ SEND to %s", exchangeName),
+            String.format("RabbitMQ SEND to %s", spanName),
             exchangeName,
             true
         );

apm-agent-tracer/src/main/java/co/elastic/apm/agent/tracer/configuration/MessagingConfiguration.java

@@ -112,7 +112,7 @@ public class MessagingConfiguration extends ConfigurationOptionProvider {
         .key("rabbitmq_naming_mode")
         .configurationCategory(MESSAGING_CATEGORY)
         .description("Defines whether the agent should use the exchanges, the routing key or the queue for the naming of RabbitMQ Transactions. Valid options are `QUEUE`, `ROUTING_KEY` and `EXCHANGE`.\n" +
-                     "Note that `QUEUE` only works when using RabbitMQ via spring-amqp."
+                     "Note that `QUEUE` only works when using RabbitMQ via spring-amqp and `ROUTING_KEY` only works for the non spring-client."
         )
         .dynamic(true)
         .tags("added[1.46.0]")

docs/configuration.asciidoc

@@ -2514,7 +2514,7 @@ Starting from version 1.43.0, the classes that are part of the 'application_pack
 ==== `rabbitmq_naming_mode` (added[1.46.0])
 
 Defines whether the agent should use the exchanges, the routing key or the queue for the naming of RabbitMQ Transactions. Valid options are `QUEUE`, `ROUTING_KEY` and `EXCHANGE`.
-Note that `QUEUE` only works when using RabbitMQ via spring-amqp.
+Note that `QUEUE` only works when using RabbitMQ via spring-amqp and `ROUTING_KEY` only works for the non spring-client.
 
 <<configuration-dynamic, image:./images/dynamic-config.svg[] >>
 
@@ -4703,10 +4703,10 @@ Example: `5ms`.
 #
 # jms_listener_packages=
 
-# Defines whether the agent should use the exchanges, the routing key or the queue for the naming of RabbitMQ Transactions. Valid options are `QUEUE` and `EXCHANGE`.
-# Note that `QUEUE` only works when using RabbitMQ via spring-amqp.
+# Defines whether the agent should use the exchanges, the routing key or the queue for the naming of RabbitMQ Transactions. Valid options are `QUEUE`, `ROUTING_KEY` and `EXCHANGE`.
+# Note that `QUEUE` only works when using RabbitMQ via spring-amqp and `ROUTING_KEY` only works for the non spring-client.
 #
-# Valid options: EXCHANGE, QUEUE
+# Valid options: EXCHANGE, QUEUE, ROUTING_KEY
 # This setting can be changed at runtime
 # Type: RabbitMQNamingMode
 # Default value: EXCHANGE