POTEL 14 - Keep Sentry span op and OTel span name in sync (#3468)

* replace hub with scopes

* Add Scopes

* Introduce `IScopes` interface.

* Replace `IHub` with `IScopes` in core

* Replace `IHub` with `IScopes` in android core

* Replace `IHub` with `IScopes` in android integrations

* Replace `IHub` with `IScopes` in apollo integrations

* Replace `IHub` with `IScopes` in okhttp integration

* Replace `IHub` with `IScopes` in graphql integration

* Replace `IHub` with `IScopes` in logging integrations

* Replace `IHub` with `IScopes` in more integrations

* Replace `IHub` with `IScopes` in OTel integration

* Replace `IHub` with `IScopes` in Spring 5 / Spring Boot 2 integrations

* Replace `IHub` with `IScopes` in Spring 6 / Spring Boot 3 integrations

* Replace `IHub` with `IScopes` in samples

* gitscopes -> github

* Replace ThreadLocal with ScopesStorage

* Move client and throwable to span map to scope

* Add global scope

* use global scope in Scopes

* Implement pushScope popScope and withScope for Scopes

* Add pushIsolationScope; add fork methods to ISCope

* Use separate scopes for current, isolation and global scope; rename mainScopes to rootScopes

* Allow controlling which scope configureScope uses

* Combine scopes

* Use new API for CRONS integrations

* Add lifecycle helper

* Change spring integrations to use new API

* Use new API in servlet integrations

* Use new API for kotlin coroutines and wrapers for Supplier/Callable

* Discussion TODOs

* Fix breadcrumb ordering

* Mark TODOS with [HSM]

* Add getGlobalScope and forkedRootScopes to IScopes

* Fix EventProcessor ordering on scopes

* Reuse code in Scopes

* No longer replace global scope

* Replace hub occurrences in comments, var names etc.

* Implement ScopesTest

* Implement CombinedScopeViewTest

* Fix combined contexts

* Use combined scopes for cross platform

* Changes according to reviews of previous PRs

* more

* even more

* isEnabled checks client instead of having a property on Scopes

* Use SentryOptions.empty

* Remove Hub

* Use OpenTelemetry for Performance and Scopes propagation

* Promote certain span attributes

* Use OTel in Sentry API

* Deduplicate SpanInfo extraction

* Forward Sentry API to Sentry through OTel

* Use OTel status for Sentry span API

* POTel Tracing

* fix root span detection (remote flag), and scope closing

* Inherit OTel span IDs when sending to sentry

* Fix tracing; parse incoming baggage; add baggage to outgoing

* Cleanup

* Move sampling logic to OTel Sampler

* Remove internal span attributes so they are not sent to Sentry

* Use transaction name

* remove obsolete comment

* 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;