Merge branch '8.x.x' into feat/restore-instrumenter-code

getsentry · Sep 19, 2024 · d0601df · d0601df
2 parents c11bc1c + 327cc51
commit d0601df
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...try/sentry-opentelemetry-extra/src/main/java/io/sentry/opentelemetry/OtelSpanWrapper.java b/...try/sentry-opentelemetry-extra/src/main/java/io/sentry/opentelemetry/OtelSpanWrapper.java
@@ -26,7 +26,6 @@
 import io.sentry.protocol.MeasurementValue;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.TransactionNameSource;
-import io.sentry.protocol.User;
 import io.sentry.util.LazyEvaluator;
 import io.sentry.util.Objects;
 import java.lang.ref.WeakReference;
@@ -210,14 +209,14 @@ public OtelSpanWrapper(
   private void updateBaggageValues() {
     synchronized (this) {
       if (baggage != null && baggage.isMutable()) {
-        final AtomicReference<User> userAtomicReference = new AtomicReference<>();
+        final AtomicReference<SentryId> replayIdAtomicReference = new AtomicReference<>();
         scopes.configureScope(
             scope -> {
-              userAtomicReference.set(scope.getUser());
+              replayIdAtomicReference.set(scope.getReplayId());
             });
         baggage.setValuesFromTransaction(
             getSpanContext().getTraceId(),
-            null,
+            replayIdAtomicReference.get(),
             scopes.getOptions(),
             this.getSamplingDecision(),
             getTransactionName(),