POTEL 34 - Retrieve the correct current span from Scope/Scopes (#3554)

* Use parent span id from sentry-trace header

* attach active span to scope

* record dropped span/transaction in SentrySampler

* changelog

* record lost span when copying parent decision

* Format code

* refactor: use sampling decision

* Retrieve current span from scope(s) in span factory

* changelog

---------

Co-authored-by: Sentry Github Bot <[email protected]>

Author: adinauer

CHANGELOG.md

@@ -10,6 +10,7 @@
 - Attach active span to scope when using OpenTelemetry ([#3549](https://github.com/getsentry/sentry-java/pull/3549))
   - Errors weren't linked to traces correctly due to parts of the SDK not knowing the current span
 - Record dropped spans in client report when sampling out OpenTelemetry spans ([#3552](https://github.com/getsentry/sentry-java/pull/3552))
+- Retrieve the correct current span from `Scope`/`Scopes` when using OpenTelemetry ([#3554](https://github.com/getsentry/sentry-java/pull/3554))
 
 ## 8.0.0-alpha.3
 

sentry-opentelemetry/sentry-opentelemetry-extra/src/main/java/io/sentry/opentelemetry/OtelSpanFactory.java

@@ -152,22 +152,16 @@ public final class OtelSpanFactory implements ISpanFactory {
     return sentrySpan;
   }
 
+  // TODO [POTEL] consider removing this method
   @Override
   public @Nullable ISpan retrieveCurrentSpan(IScopes scopes) {
-    final @Nullable Span span = Span.fromContextOrNull(Context.current());
-    if (span == null) {
-      return null;
-    }
-    return storage.getSentrySpan(span.getSpanContext());
+    return scopes.getSpan();
   }
 
+  // TODO [POTEL] consider removing this method
   @Override
   public @Nullable ISpan retrieveCurrentSpan(IScope scope) {
-    final @Nullable Span span = Span.fromContextOrNull(Context.current());
-    if (span == null) {
-      return null;
-    }
-    return storage.getSentrySpan(span.getSpanContext());
+    return scope.getSpan();
   }
 
   private @NotNull Tracer getTracer() {