ref(serverless): Use new scopes API (#2896)

Author: sentrivana

sentry_sdk/integrations/serverless.py

@@ -1,7 +1,7 @@
 import sys
 from functools import wraps
 
-from sentry_sdk.hub import Hub
+import sentry_sdk
 from sentry_sdk.utils import event_from_exception, reraise
 from sentry_sdk._types import TYPE_CHECKING
 
@@ -42,17 +42,16 @@ def wrapper(f):
         @wraps(f)
         def inner(*args, **kwargs):
             # type: (*Any, **Any) -> Any
-            with Hub(Hub.current) as hub:
-                with hub.configure_scope() as scope:
-                    scope.clear_breadcrumbs()
+            with sentry_sdk.isolation_scope() as scope:
+                scope.clear_breadcrumbs()
 
                 try:
                     return f(*args, **kwargs)
                 except Exception:
                     _capture_and_reraise()
                 finally:
                     if flush:
-                        _flush_client()
+                        sentry_sdk.flush()
 
         return inner  # type: ignore
 
@@ -65,18 +64,13 @@ def inner(*args, **kwargs):
 def _capture_and_reraise():
     # type: () -> None
     exc_info = sys.exc_info()
-    hub = Hub.current
-    if hub.client is not None:
+    client = sentry_sdk.get_client()
+    if client.is_active():
         event, hint = event_from_exception(
             exc_info,
-            client_options=hub.client.options,
+            client_options=client.options,
             mechanism={"type": "serverless", "handled": False},
         )
-        hub.capture_event(event, hint=hint)
+        sentry_sdk.capture_event(event, hint=hint)
 
     reraise(*exc_info)
-
-
-def _flush_client():
-    # type: () -> None
-    return Hub.current.flush()

tests/integrations/serverless/test_serverless.py

@@ -11,9 +11,7 @@ def test_basic(sentry_init, capture_exceptions, monkeypatch):
 
     @serverless_function
     def foo():
-        monkeypatch.setattr(
-            "sentry_sdk.Hub.current.flush", lambda: flush_calls.append(1)
-        )
+        monkeypatch.setattr("sentry_sdk.flush", lambda: flush_calls.append(1))
         1 / 0
 
     with pytest.raises(ZeroDivisionError):
@@ -31,7 +29,7 @@ def test_flush_disabled(sentry_init, capture_exceptions, monkeypatch):
 
     flush_calls = []
 
-    monkeypatch.setattr("sentry_sdk.Hub.current.flush", lambda: flush_calls.append(1))
+    monkeypatch.setattr("sentry_sdk.flush", lambda: flush_calls.append(1))
 
     @serverless_function(flush=False)
     def foo():