Merge 9047c00 into 7a1bc74

adinauer · web-flow · commit b11c9286b6bd · 2025-11-07T11:09:01.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 
 - Removed SentryExecutorService limit for delayed scheduled tasks ([#4846](https://github.com/getsentry/sentry-java/pull/4846))
 - Fix visual artifacts for the Canvas strategy on some devices ([#4861](https://github.com/getsentry/sentry-java/pull/4861))
+- Copy active span on scope clone ([#4878](https://github.com/getsentry/sentry-java/pull/4878))
 
 ### Improvements
 
diff --git a/sentry/src/main/java/io/sentry/Scope.java b/sentry/src/main/java/io/sentry/Scope.java
@@ -124,6 +124,7 @@ public Scope(final @NotNull SentryOptions options) {
   private Scope(final @NotNull Scope scope) {
     this.transaction = scope.transaction;
     this.transactionName = scope.transactionName;
+    this.activeSpan = scope.activeSpan;
     this.session = scope.session;
     this.options = scope.options;
     this.level = scope.level;
diff --git a/sentry/src/test/java/io/sentry/ScopeTest.kt b/sentry/src/test/java/io/sentry/ScopeTest.kt
@@ -12,6 +12,7 @@ import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertNotSame
 import kotlin.test.assertNull
+import kotlin.test.assertSame
 import kotlin.test.assertTrue
 import org.junit.Assert.assertArrayEquals
 import org.mockito.kotlin.any
@@ -155,6 +156,21 @@ class ScopeTest {
     assertEquals(attachment.contentType, actual.contentType)
   }
 
+  @Test
+  fun `copying scope copies active span`() {
+    val scope = Scope(SentryOptions())
+
+    val transaction =
+      SentryTracer(TransactionContext("transaction-name", "op"), NoOpScopes.getInstance())
+    val span = transaction.startChild("child1")
+
+    scope.setActiveSpan(span)
+
+    val clone = scope.clone()
+
+    assertSame(span, clone.span)
+  }
+
   @Test
   fun `copying scope and changing the original values wont change the clone values`() {
     val scope = Scope(SentryOptions())
