Assume http.client for span op if not a root span

Author: adinauer

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

@@ -18,23 +18,16 @@ public final class SpanDescriptionExtractor {
   @SuppressWarnings("deprecation")
   public @NotNull OtelSpanInfo extractSpanInfo(
       final @NotNull SpanData otelSpan, final @Nullable IOtelSpanWrapper sentrySpan) {
-    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 @NotNull Attributes attributes = otelSpan.getAttributes();
 
-      final @Nullable String httpRequestMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD);
-      if (httpRequestMethod != null) {
-        return descriptionForHttpMethod(otelSpan, httpRequestMethod);
-      }
+    final @Nullable String httpMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD);
+    if (httpMethod != null) {
+      return descriptionForHttpMethod(otelSpan, httpMethod);
+    }
 
-      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();
@@ -44,10 +37,6 @@ 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) {
@@ -60,6 +49,12 @@ private OtelSpanInfo descriptionForHttpMethod(
       opBuilder.append(".client");
     } else if (SpanKind.SERVER.equals(kind)) {
       opBuilder.append(".server");
+    } else {
+      // we cannot be certain that a root span is a server span as it might simply be a client span
+      // without parent
+      if (!isRootSpan(otelSpan)) {
+        opBuilder.append(".client");
+      }
     }
     final @Nullable String httpTarget = attributes.get(HttpIncubatingAttributes.HTTP_TARGET);
     final @Nullable String httpRoute = attributes.get(HttpAttributes.HTTP_ROUTE);
@@ -92,6 +87,10 @@ private OtelSpanInfo descriptionForHttpMethod(
     return new OtelSpanInfo(op, description, transactionNameSource);
   }
 
+  private static boolean isRootSpan(SpanData otelSpan) {
+    return !otelSpan.getParentSpanContext().isValid() || otelSpan.getParentSpanContext().isRemote();
+  }
+
   @SuppressWarnings("deprecation")
   private OtelSpanInfo descriptionForDbSystem(final @NotNull SpanData otelSpan) {
     final @NotNull Attributes attributes = otelSpan.getAttributes();