fix(scope): Copy _last_event_id in Scope.__copy__

szokeasaurusrex · adamchainz · szokeasaurusrex · commit ad237dcb8f03 · 2024-06-03T09:49:38.000-04:00
Fixes GH-3113 Co-authored-by: Adam Johnson <me@adamj.eu>
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
@@ -244,6 +244,8 @@ def __copy__(self):
 
         rv._profile = self._profile
 
+        rv._last_event_id = self._last_event_id
+
         return rv
 
     @classmethod
diff --git a/tests/test_basics.py b/tests/test_basics.py
@@ -17,6 +17,7 @@
     start_transaction,
     last_event_id,
     add_breadcrumb,
+    isolation_scope,
     Hub,
     Scope,
 )
@@ -800,3 +801,11 @@ def test_last_event_id_transaction(sentry_init):
         pass
 
     assert last_event_id() is None, "Transaction should not set last_event_id"
+
+
+def test_last_event_id_scope(sentry_init):
+    sentry_init(enable_tracing=True)
+
+    # Should not crash
+    with isolation_scope() as scope:
+        assert scope.last_event_id() is None
diff --git a/tests/test_scope.py b/tests/test_scope.py
@@ -19,6 +19,10 @@
 )
 
 
+SLOTS_NOT_COPIED = {"client"}
+"""__slots__ that are not copied when copying a Scope object."""
+
+
 def test_copying():
     s1 = Scope()
     s1.fingerprint = {}
@@ -34,6 +38,15 @@ def test_copying():
     assert s1._fingerprint is s2._fingerprint
 
 
+def test_all_slots_copied():
+    scope = Scope()
+    scope_copy = copy.copy(scope)
+
+    # Check all attributes are copied
+    for attr in set(Scope.__slots__) - SLOTS_NOT_COPIED:
+        assert getattr(scope_copy, attr) == getattr(scope, attr)
+
+
 def test_merging(sentry_init, capture_events):
     sentry_init()
 
