Keep OTel and Sentry span name/op in sync

Author: adinauer

sentry-opentelemetry/sentry-opentelemetry-bootstrap/api/sentry-opentelemetry-bootstrap.api

@@ -19,7 +19,9 @@ public final class io/sentry/opentelemetry/OtelContextScopesStorage : io/sentry/
 
 public final class io/sentry/opentelemetry/OtelSpanContext : io/sentry/SpanContext {
 	public fun <init> (Lio/opentelemetry/sdk/trace/ReadWriteSpan;Lio/sentry/TracesSamplingDecision;Lio/sentry/opentelemetry/OtelSpanWrapper;Lio/sentry/Baggage;)V
+	public fun getOperation ()Ljava/lang/String;
 	public fun getStatus ()Lio/sentry/SpanStatus;
+	public fun setOperation (Ljava/lang/String;)V
 	public fun setStatus (Lio/sentry/SpanStatus;)V
 }
 

sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelSpanContext.java

@@ -75,6 +75,23 @@ public void setStatus(@Nullable SpanStatus status) {
     }
   }
 
+  @Override
+  public @NotNull String getOperation() {
+    final @Nullable ReadWriteSpan otelSpan = span.get();
+    if (otelSpan != null) {
+      return otelSpan.getName();
+    }
+    return "<unlabeled span>";
+  }
+
+  @Override
+  public void setOperation(@NotNull String operation) {
+    final @Nullable ReadWriteSpan otelSpan = span.get();
+    if (otelSpan != null) {
+      otelSpan.updateName(operation);
+    }
+  }
+
   private @Nullable SpanStatus otelStatusCodeFallback(final @NotNull StatusData otelStatus) {
     if (otelStatus.getStatusCode() == StatusCode.ERROR) {
       return SpanStatus.UNKNOWN_ERROR;

sentry/src/main/java/io/sentry/SpanContext.java

@@ -150,7 +150,6 @@ public SpanId getParentSpanId() {
   }
 
   public @NotNull String getOperation() {
-    // TODO [POTEL] use span name here
     return op;
   }