fix: New scope for each serverless func

untitaker · untitaker · commit 0a20f0997b01 · 2019-02-24T14:46:50.000+01:00
diff --git a/sentry_sdk/integrations/serverless.py b/sentry_sdk/integrations/serverless.py
@@ -10,13 +10,14 @@ def serverless_function(f=None, flush=True):
     def wrapper(f):
         @functools.wraps(f)
         def inner(*args, **kwargs):
-            try:
-                return f(*args, **kwargs)
-            except Exception:
-                _capture_and_reraise()
-            finally:
-                if flush:
-                    _flush_client()
+            with Hub(Hub.current):
+                try:
+                    return f(*args, **kwargs)
+                except Exception:
+                    _capture_and_reraise()
+                finally:
+                    if flush:
+                        _flush_client()
 
         return inner
 
diff --git a/tests/integrations/serverless/test_serverless.py b/tests/integrations/serverless/test_serverless.py
@@ -9,10 +9,11 @@ def test_basic(sentry_init, capture_exceptions, monkeypatch):
 
     flush_calls = []
 
-    monkeypatch.setattr("sentry_sdk.Hub.current.flush", lambda: flush_calls.append(1))
-
     @serverless_function
     def foo():
+        monkeypatch.setattr(
+            "sentry_sdk.Hub.current.flush", lambda: flush_calls.append(1)
+        )
         1 / 0
 
     with pytest.raises(ZeroDivisionError):
