feat(scope): Add last_event_id to Scope

Fixes #3049

Author: szokeasaurusrex

sentry_sdk/scope.py

@@ -185,6 +185,7 @@ class Scope(object):
         "_propagation_context",
         "client",
         "_type",
+        "_last_event_id",
     )
 
     def __init__(self, ty=None, client=None):
@@ -207,6 +208,9 @@ def __init__(self, ty=None, client=None):
         incoming_trace_information = self._load_trace_data_from_env()
         self.generate_propagation_context(incoming_data=incoming_trace_information)
 
+        # self._last_event_id is only applicable to isolation scopes
+        self._last_event_id = None  # type: Optional[str]
+
     def __copy__(self):
         # type: () -> Scope
         """
@@ -308,6 +312,16 @@ def get_global_scope(cls):
 
         return _global_scope
 
+    @classmethod
+    def last_event_id(cls):
+        # type: () -> Optional[str]
+        """
+        .. versionadded:: 2.X.X
+
+        Returns the last event id of the isolation scope.
+        """
+        return cls.get_isolation_scope()._last_event_id
+
     def _merge_scopes(self, additional_scope=None, additional_scope_kwargs=None):
         # type: (Optional[Scope], Optional[Dict[str, Any]]) -> Scope
         """
@@ -1089,7 +1103,12 @@ def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
         """
         scope = self._merge_scopes(scope, scope_kwargs)
 
-        return Scope.get_client().capture_event(event=event, hint=hint, scope=scope)
+        event_id = Scope.get_client().capture_event(event=event, hint=hint, scope=scope)
+
+        if event_id is not None and event.get("type") != "transaction":
+            self.get_isolation_scope()._last_event_id = event_id
+
+        return event_id
 
     def capture_message(self, message, level=None, scope=None, **scope_kwargs):
         # type: (str, Optional[LogLevelStr], Optional[Scope], Any) -> Optional[str]

tests/test_scope.py

@@ -822,3 +822,34 @@ def test_set_tags():
         "tag2": "updated",
         "tag3": "new",
     }, "Updating tags with empty dict changed tags"
+
+
+@pytest.mark.parametrize(
+    "scope_getter",
+    (Scope.get_global_scope, Scope.get_isolation_scope, Scope.get_current_scope),
+)
+def test_last_event_id(scope_getter, sentry_init):
+    sentry_init(enable_tracing=True)
+    scope = scope_getter()
+
+    assert scope.last_event_id() is None
+
+    sentry_sdk.capture_exception(Exception("test"))
+
+    assert scope.last_event_id() is not None
+
+
+@pytest.mark.parametrize(
+    "scope_getter",
+    (Scope.get_global_scope, Scope.get_isolation_scope, Scope.get_current_scope),
+)
+def test_last_event_id_transaction(scope_getter, sentry_init):
+    sentry_init(enable_tracing=True)
+    scope = scope_getter()
+
+    assert scope.last_event_id() is None
+
+    with sentry_sdk.start_transaction(name="test"):
+        pass
+
+    assert scope.last_event_id() is None, "Transaction should not set last_event_id"