From 200054698a18676bf614552436b6883a60278665 Mon Sep 17 00:00:00 2001
From: Sanket Mundra <sanket.mundra@traceable.ai>
Date: Tue, 30 Jan 2024 16:29:46 +0530
Subject: [PATCH 1/2] Add new otel attribute for Rabitmq backend

---
 .../utils/messaging/MessagingSemanticConventionUtils.java    | 3 ++-
 .../messaging/OtelMessagingSemanticConventions.java          | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/semantic-convention-utils/src/main/java/org/hypertrace/semantic/convention/utils/messaging/MessagingSemanticConventionUtils.java b/semantic-convention-utils/src/main/java/org/hypertrace/semantic/convention/utils/messaging/MessagingSemanticConventionUtils.java
index 59dfb075f..ec72bcf26 100644
--- a/semantic-convention-utils/src/main/java/org/hypertrace/semantic/convention/utils/messaging/MessagingSemanticConventionUtils.java
+++ b/semantic-convention-utils/src/main/java/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/span-normalizer/span-normalizer-constants/src/main/java/org/hypertrace/core/semantic/convention/constants/messaging/OtelMessagingSemanticConventions.java b/span-normalizer/span-normalizer-constants/src/main/java/org/hypertrace/core/semantic/convention/constants/messaging/OtelMessagingSemanticConventions.java
index 19357909a..c2f084aa8 100644
--- a/span-normalizer/span-normalizer-constants/src/main/java/org/hypertrace/core/semantic/convention/constants/messaging/OtelMessagingSemanticConventions.java
+++ b/span-normalizer/span-normalizer-constants/src/main/java/org/hypertrace/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"),

From 6e4e0bcceac7cddaf68fa4768a9a30a86c15a148 Mon Sep 17 00:00:00 2001
From: Sanket Mundra <sanket.mundra@traceable.ai>
Date: Tue, 30 Jan 2024 16:40:52 +0530
Subject: [PATCH 2/2] Increase vuln expiry

---
 owasp-suppressions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owasp-suppressions.xml b/owasp-suppressions.xml
index 86dc9891e..92cc25425 100644
--- a/owasp-suppressions.xml
+++ b/owasp-suppressions.xml
@@ -74,7 +74,7 @@
     <packageUrl regex="true">^pkg:maven/org\.quartz\-scheduler/quartz@.*$</packageUrl>
     <cve>CVE-2023-39017</cve>
   </suppress>
-  <suppress until="2024-01-30Z">
+  <suppress until="2024-02-29Z">
     <notes><![CDATA[
    file name: json-20230618.jar
    ]]></notes>