do not override span name if customized

Author: adinauer

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

@@ -13,12 +13,23 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+
 @ApiStatus.Internal
 public final class SpanDescriptionExtractor {
 
-  @SuppressWarnings("deprecation")
   public @NotNull OtelSpanInfo extractSpanInfo(
       final @NotNull SpanData otelSpan, final @Nullable IOtelSpanWrapper sentrySpan) {
+    OtelSpanInfo spanInfo = extractSpanInfoInternal(otelSpan);
+    if (spanInfo != null) {
+      return spanInfo;
+    }
+
+    return defaultInfo(otelSpan, sentrySpan);
+  }
+
+  @SuppressWarnings("deprecation")
+  private @Nullable OtelSpanInfo extractSpanInfoInternal(final @NotNull SpanData otelSpan) {
     final @NotNull Attributes attributes = otelSpan.getAttributes();
 
     final @Nullable String httpMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD);
@@ -37,6 +48,10 @@ public final class SpanDescriptionExtractor {
       return descriptionForGraphql(otelSpan);
     }
 
+    return null;
+  }
+
+  private @NotNull OtelSpanInfo defaultInfo(final @NotNull SpanData otelSpan, final @Nullable IOtelSpanWrapper sentrySpan) {
     final @NotNull String name = otelSpan.getName();
     final @Nullable String maybeDescription =
         sentrySpan != null ? sentrySpan.getDescription() : name;
@@ -113,7 +128,12 @@ private OtelSpanInfo descriptionForDbSystem(final @NotNull SpanData otelSpan) {
     return new OtelSpanInfo("db", otelSpan.getName(), TransactionNameSource.TASK);
   }
 
-  private OtelSpanInfo descriptionForGraphql(final @NotNull SpanData otelSpan) {
+  private @Nullable OtelSpanInfo descriptionForGraphql(final @NotNull SpanData otelSpan) {
+    final @NotNull String name = otelSpan.getName();
+    // do not replace span name set by customer
+    if (!Arrays.asList("query", "mutation", "subscription").contains(name)) {
+      return null;
+    }
     final @NotNull Attributes attributes = otelSpan.getAttributes();
     @Nullable
     String graphqlOperationType =
@@ -126,6 +146,6 @@ private OtelSpanInfo descriptionForGraphql(final @NotNull SpanData otelSpan) {
       return new OtelSpanInfo(description, description, TransactionNameSource.TASK);
     }
 
-    return new OtelSpanInfo(otelSpan.getName(), otelSpan.getName(), TransactionNameSource.TASK);
+    return null;
   }
 }

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

@@ -270,6 +270,23 @@ class SpanDescriptionExtractorTest {
     assertEquals(TransactionNameSource.TASK, info.transactionNameSource)
   }
 
+  @Test
+  fun `does not set op to graphql for span with graphql operation type if span name has been overridden`() {
+    givenAttributes(
+      mapOf(
+        GraphqlIncubatingAttributes.GRAPHQL_OPERATION_TYPE to "query",
+        GraphqlIncubatingAttributes.GRAPHQL_OPERATION_NAME to "GreetingQuery",
+      )
+    )
+    givenSpanName("my-custom-span-name")
+
+    val info = whenExtractingSpanInfo()
+
+    assertEquals("my-custom-span-name", info.op)
+    assertEquals("my-custom-span-name", info.description)
+    assertEquals(TransactionNameSource.CUSTOM, info.transactionNameSource)
+  }
+
   private fun createSpanContext(
     isRemote: Boolean,
     traceId: String = "f9118105af4a2d42b4124532cd1065ff",