Do not replace op with auto generated content for OpenTelemetry spa…

…ns with span kind`INTERNAL` (#3906) * Disable op generation from span attributes if span kind is internal * changelog * Apply suggestions from code review
getsentry · Nov 21, 2024 · 92518a2 · 92518a2
1 parent 64bb185
commit 92518a2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@
 - Send `otel.kind` to Sentry ([#3907](https://github.com/getsentry/sentry-java/pull/3907))
 - Allow passing `environment` to `CheckinUtils.withCheckIn` ([3889](https://github.com/getsentry/sentry-java/pull/3889))
 
+### Fixes
+
+- Do not replace `op` with auto generated content for OpenTelemetry spans with span kind `INTERNAL` ([#3906](https://github.com/getsentry/sentry-java/pull/3906))
+
 ## 8.0.0-beta.2
 
 ### Breaking Changes

diff --git a/...ry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java b/...ry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java
@@ -18,21 +18,23 @@ public final class SpanDescriptionExtractor {
   @SuppressWarnings("deprecation")
   public @NotNull OtelSpanInfo extractSpanInfo(
       final @NotNull SpanData otelSpan, final @Nullable IOtelSpanWrapper sentrySpan) {
-    final @NotNull Attributes attributes = otelSpan.getAttributes();
+    if (!isInternalSpanKind(otelSpan)) {
+      final @NotNull Attributes attributes = otelSpan.getAttributes();
 
-    final @Nullable String httpMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD);
-    if (httpMethod != null) {
-      return descriptionForHttpMethod(otelSpan, httpMethod);
-    }
+      final @Nullable String httpMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD);
+      if (httpMethod != null) {
+        return descriptionForHttpMethod(otelSpan, httpMethod);
+      }
 
-    final @Nullable String httpRequestMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD);
-    if (httpRequestMethod != null) {
-      return descriptionForHttpMethod(otelSpan, httpRequestMethod);
-    }
+      final @Nullable String httpRequestMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD);
+      if (httpRequestMethod != null) {
+        return descriptionForHttpMethod(otelSpan, httpRequestMethod);
+      }
 
-    final @Nullable String dbSystem = attributes.get(DbIncubatingAttributes.DB_SYSTEM);
-    if (dbSystem != null) {
-      return descriptionForDbSystem(otelSpan);
+      final @Nullable String dbSystem = attributes.get(DbIncubatingAttributes.DB_SYSTEM);
+      if (dbSystem != null) {
+        return descriptionForDbSystem(otelSpan);
+      }
     }
 
     final @NotNull String name = otelSpan.getName();
@@ -42,6 +44,10 @@ public final class SpanDescriptionExtractor {
     return new OtelSpanInfo(name, description, TransactionNameSource.CUSTOM);
   }
 
+  private boolean isInternalSpanKind(final @NotNull SpanData otelSpan) {
+    return SpanKind.INTERNAL.equals(otelSpan.getKind());
+  }
+
   @SuppressWarnings("deprecation")
   private OtelSpanInfo descriptionForHttpMethod(
       final @NotNull SpanData otelSpan, final @NotNull String httpMethod) {