Merge branch 'main' into sanket/fixHomePageApiCreation

hypertrace · Feb 5, 2024 · 82254e3 · 82254e3
2 parents 39317b1 + 475aca8
commit 82254e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.../org/hypertrace/semantic/convention/utils/messaging/MessagingSemanticConventionUtils.java b/.../org/hypertrace/semantic/convention/utils/messaging/MessagingSemanticConventionUtils.java
@@ -50,7 +50,8 @@ public class MessagingSemanticConventionUtils {
       new ArrayList<>(
           Arrays.asList(
               RawSpanConstants.getValue(RabbitMq.RABBIT_MQ_ROUTING_KEY),
-              OtelMessagingSemanticConventions.RABBITMQ_ROUTING_KEY.getValue()));
+              OtelMessagingSemanticConventions.RABBITMQ_ROUTING_KEY.getValue(),
+              OtelMessagingSemanticConventions.RABBITMQ_DESTINATION_ROUTING_KEY.getValue()));
 
   /**
    * @param event Object encapsulating span data

diff --git a/...rtrace/core/semantic/convention/constants/messaging/OtelMessagingSemanticConventions.java b/...rtrace/core/semantic/convention/constants/messaging/OtelMessagingSemanticConventions.java
@@ -5,7 +5,12 @@ public enum OtelMessagingSemanticConventions {
   MESSAGING_SYSTEM("messaging.system"),
   MESSAGING_URL("messaging.url"),
   RABBITMQ_MESSAGING_SYSTEM_VALUE("rabbitmq"),
+  /**
+   * Otel semantic-conventions-java has marked this @deprecated. Use {@link
+   * OtelMessagingSemanticConventions#RABBITMQ_DESTINATION_ROUTING_KEY} instead
+   */
   RABBITMQ_ROUTING_KEY("messaging.rabbitmq.routing_key"),
+  RABBITMQ_DESTINATION_ROUTING_KEY("messaging.rabbitmq.destination.routing_key"),
   RABBITMQ_COMMAND("rabbitmq.command"),
   KAFKA_MESSAGING_SYSTEM_VALUE("kafka"),
   AWS_SQS_MESSAGING_SYSTEM_VALUE("sqs"),