Address review comments from copilot-pull-request-reviewer: omit generated RabbitMQ queues from span names

Author: trask

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/v2_7/RabbitDeliveryAttributesGetter.java

@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableMessagingSemconv;
 import static io.opentelemetry.javaagent.instrumentation.rabbitmq.v2_7.RabbitInstrumenterHelper.consumerDestinationName;
+import static io.opentelemetry.javaagent.instrumentation.rabbitmq.v2_7.RabbitInstrumenterHelper.isGeneratedQueueName;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
@@ -52,7 +53,7 @@ public boolean isTemporaryDestination(DeliveryRequest request) {
 
   @Override
   public boolean isAnonymousDestination(DeliveryRequest request) {
-    return false;
+    return isGeneratedQueueName(request.getQueue());
   }
 
   @Nullable

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/v2_7/RabbitInstrumenterHelper.java

@@ -38,7 +38,10 @@ public void onPublish(Span span, String exchange, String routingKey) {
     if (emitStableMessagingSemconv()) {
       String destinationName = producerDestinationName(exchange, routingKey);
       span.setAttribute(MESSAGING_DESTINATION_NAME, destinationName);
-      span.updateName("publish " + destinationName);
+      span.updateName(
+          isDefaultExchange(exchange) && isGeneratedQueueName(routingKey)
+              ? "publish"
+              : "publish " + destinationName);
     } else {
       span.setAttribute(MESSAGING_DESTINATION_NAME, exchangeName);
       span.updateName(exchangeName + " publish");
@@ -66,7 +69,15 @@ public void onProps(Context context, Span span, AMQP.BasicProperties props) {
   }
 
   private static String normalizeExchangeName(String exchange) {
-    return exchange == null || exchange.isEmpty() ? "<default>" : exchange;
+    return isDefaultExchange(exchange) ? "<default>" : exchange;
+  }
+
+  private static boolean isDefaultExchange(@Nullable String exchange) {
+    return exchange == null || exchange.isEmpty();
+  }
+
+  static boolean isGeneratedQueueName(@Nullable String queue) {
+    return queue != null && (queue.startsWith("amq.gen-") || queue.startsWith("spring.gen-"));
   }
 
   static String producerDestinationName(String exchange, String routingKey) {

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/v2_7/RabbitReceiveAttributesGetter.java

@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableMessagingSemconv;
 import static io.opentelemetry.javaagent.instrumentation.rabbitmq.v2_7.RabbitInstrumenterHelper.consumerDestinationName;
+import static io.opentelemetry.javaagent.instrumentation.rabbitmq.v2_7.RabbitInstrumenterHelper.isGeneratedQueueName;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
@@ -57,7 +58,7 @@ public boolean isTemporaryDestination(ReceiveRequest request) {
 
   @Override
   public boolean isAnonymousDestination(ReceiveRequest request) {
-    return false;
+    return isGeneratedQueueName(request.getQueue());
   }
 
   @Nullable

instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/v2_7/RabbitMqTest.java

@@ -639,9 +639,16 @@ private static void verifySpan(
       boolean expectTimestamp) {
     String destination = destinationName(exchange, routingKey, operation, resource);
     String legacyResource = normalizeQueueName(resource);
+    boolean anonymousDestination =
+        emitStableMessagingSemconv()
+            && (("publish".equals(operation)
+                    && "<default>".equals(exchange)
+                    && RabbitInstrumenterHelper.isGeneratedQueueName(routingKey))
+                || (("receive".equals(operation) || "process".equals(operation))
+                    && RabbitInstrumenterHelper.isGeneratedQueueName(resource)));
     String spanName =
         emitStableMessagingSemconv() && operation != null
-            ? operation + " " + destination
+            ? anonymousDestination ? operation : operation + " " + destination
             : legacyResource + (operation == null ? "" : " " + operation);
 
     span.hasName(spanName);

instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMessageAttributesGetter.java

@@ -90,7 +90,11 @@ public boolean isTemporaryDestination(Message message) {
 
   @Override
   public boolean isAnonymousDestination(Message message) {
-    return false;
+    return isGeneratedQueueName(getConsumerQueue(message.getMessageProperties()));
+  }
+
+  private static boolean isGeneratedQueueName(@Nullable String queue) {
+    return queue != null && (queue.startsWith("amq.gen-") || queue.startsWith("spring.gen-"));
   }
 
   @Override

instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMqTest.java

@@ -258,18 +258,19 @@ void testAnonymousQueueSpanName() throws Exception {
         trace ->
             trace.hasSpansSatisfyingExactly(
                 span ->
-                    span.hasName(
-                        emitStableMessagingSemconv()
-                            ? "publish " + anonymousQueueName
-                            : "<default> publish"),
+                    span.hasName(emitStableMessagingSemconv() ? "publish" : "<default> publish")
+                        .hasAttribute(
+                            equalTo(
+                                MESSAGING_DESTINATION_NAME,
+                                emitStableMessagingSemconv() ? anonymousQueueName : "<default>")),
                 // Verify that a constant span name is used instead of the randomly generated
                 // anonymous queue name
                 span ->
-                    span.hasName(
-                            emitStableMessagingSemconv()
-                                ? "process " + anonymousQueueName
-                                : "<generated> process")
-                        .hasAttribute(
+                    span.hasName(emitStableMessagingSemconv() ? "process" : "<generated> process")
+                        .hasAttributesSatisfying(
+                            equalTo(
+                                MESSAGING_DESTINATION_NAME,
+                                emitStableMessagingSemconv() ? anonymousQueueName : "<default>"),
                             equalTo(
                                 MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY, anonymousQueueName))),
         trace -> trace.hasSpansSatisfyingExactly(span -> span.hasName("basic.qos")),