fix(otel): Prefer messaging over http mapping when queue tracing enabled

Some OTel instrumentations (notably aws-sdk-2.2 SQS) attach both
`http.request.method` and `messaging.system` to the same span. With the
previous gate order, those spans resolved to http.client and the Sentry
Queues product never lit up for one of the most common OTel-coexistence
targets.

When `enableQueueTracing` is true and `messaging.system` is present, map
to a queue.* op before the http and db checks. When the flag is off, the
existing http-first ordering is preserved.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: adinauer

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java

@@ -24,6 +24,14 @@ public final class SpanDescriptionExtractor {
       final @NotNull SentryOptions options) {
     final @NotNull Attributes attributes = otelSpan.getAttributes();
 
+    if (options.isEnableQueueTracing()) {
+      final @Nullable String messagingSystem =
+          attributes.get(MessagingIncubatingAttributes.MESSAGING_SYSTEM);
+      if (messagingSystem != null) {
+        return descriptionForMessagingSystem(otelSpan);
+      }
+    }
+
     final @Nullable String httpMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD);
     if (httpMethod != null) {
       return descriptionForHttpMethod(otelSpan, httpMethod);
@@ -34,14 +42,6 @@ public final class SpanDescriptionExtractor {
       return descriptionForDbSystem(otelSpan);
     }
 
-    if (options.isEnableQueueTracing()) {
-      final @Nullable String messagingSystem =
-          attributes.get(MessagingIncubatingAttributes.MESSAGING_SYSTEM);
-      if (messagingSystem != null) {
-        return descriptionForMessagingSystem(otelSpan);
-      }
-    }
-
     final @NotNull String name = otelSpan.getName();
     final @Nullable String maybeDescription =
         sentrySpan != null ? sentrySpan.getDescription() : name;

sentry-opentelemetry/sentry-opentelemetry-core/src/test/kotlin/SpanDescriptionExtractorTest.kt

@@ -364,6 +364,48 @@ class SpanDescriptionExtractorTest {
     assertEquals("my-topic publish", info.description)
   }
 
+  @Test
+  fun `messaging mapping wins over http when both attributes present and queue tracing enabled`() {
+    // Some OTel instrumentations (e.g. aws-sdk-2.2 SQS) attach both messaging and http
+    // attributes to the same span. Messaging is more specific and must win.
+    givenSpanKind(SpanKind.PRODUCER)
+    givenAttributes(
+      mapOf(
+        HttpAttributes.HTTP_REQUEST_METHOD to "POST",
+        UrlAttributes.URL_FULL to "https://sqs.us-east-1.amazonaws.com/",
+        MessagingIncubatingAttributes.MESSAGING_SYSTEM to "aws.sqs",
+        MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME to "my-queue",
+        MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE to "publish",
+      )
+    )
+
+    val info = whenExtractingSpanInfo(queueTracingEnabled = true)
+
+    assertEquals("queue.publish", info.op)
+    assertEquals("my-queue", info.description)
+    assertEquals(TransactionNameSource.TASK, info.transactionNameSource)
+  }
+
+  @Test
+  fun `http mapping wins over messaging when queue tracing disabled`() {
+    givenSpanKind(SpanKind.CLIENT)
+    givenAttributes(
+      mapOf(
+        HttpAttributes.HTTP_REQUEST_METHOD to "POST",
+        UrlAttributes.URL_FULL to "https://sqs.us-east-1.amazonaws.com/",
+        MessagingIncubatingAttributes.MESSAGING_SYSTEM to "aws.sqs",
+        MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME to "my-queue",
+        MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE to "publish",
+      )
+    )
+
+    val info = whenExtractingSpanInfo(queueTracingEnabled = false)
+
+    assertEquals("http.client", info.op)
+    assertEquals("POST https://sqs.us-east-1.amazonaws.com/", info.description)
+    assertEquals(TransactionNameSource.URL, info.transactionNameSource)
+  }
+
   @Test
   fun `uses span name as op and description if no relevant attributes`() {
     givenSpanName("span name")