chore: remove unnecessary tls

untitaker · untitaker · commit 93e57adeb50b · 2018-07-22T21:11:59.000+02:00
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
@@ -39,14 +39,15 @@ def __exit__(self, exc_type, exc_value, tb):
 
 class _ScopeManager(object):
 
-    def __init__(self, hub):
+    def __init__(self, hub, layer):
         self._hub = hub
+        self._layer = layer
 
     def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_value, tb):
-        self._hub._stack.pop()
+        assert self._hub._stack.pop() == self._layer, 'popped wrong scope'
 
 
 class Hub(with_metaclass(HubMeta)):
@@ -162,11 +163,18 @@ def add_event_processor(self, factory):
             self._pending_processors.append(factory)
 
     def push_scope(self):
-        """Pushes a new layer on the scope stack."""
+        """Pushes a new layer on the scope stack. Returns a context manager
+        that should be used to pop the scope again."""
         self._flush_event_processors()
         client, scope = self._stack[-1]
-        self._stack.append((client, copy.copy(scope)))
-        return _ScopeManager(self)
+        new_layer = (client, copy.copy(scope))
+        self._stack.append(new_layer)
+        return _ScopeManager(self, new_layer)
+
+    def pop_scope_unsafe(self):
+        """Pops a scope layer from the stack. Try to use the context manager
+        `push_scope()` instead."""
+        self._stack.pop()
 
     @contextmanager
     def configure_scope(self):
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
@@ -24,16 +24,12 @@
 def _get_transaction_from_request(request):
     return resolve(request.path).func.__name__
 
-_request_scope = ContextVar('sentry_django_request_scope')
-
-
 # request_started (or any other signal) cannot be used because the request is
 # not yet available
 class SentryMiddleware(MiddlewareMixin):
     def process_request(self, request):
         try:
-            assert _request_scope.get(None) is None, 'race condition'
-            _request_scope.set(get_current_hub().push_scope().__enter__())
+            get_current_hub().push_scope()
 
             with configure_scope() as scope:
                 scope.transaction = _get_transaction_from_request(request)
@@ -42,13 +38,7 @@ def process_request(self, request):
 
 
 def _request_finished(*args, **kwargs):
-    try:
-        val = _request_scope.get(None)
-        assert val is not None, 'race condition'
-        val.__exit__(None, None, None)
-        _request_scope.set(None)
-    except Exception:
-        get_current_hub().capture_internal_exception()
+    get_current_hub().pop_scope_unsafe()
 
 
 def _got_request_exception(request=None, **kwargs):
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
@@ -31,29 +31,12 @@ def init_app(self, app):
 
 
 def _push_appctx(*args, **kwargs):
-    try:
-        assert getattr(
-            _app_ctx_stack.top,
-            '_sentry_app_scope_manager',
-            None
-        ) is None, 'race condition'
-        _app_ctx_stack.top._sentry_app_scope_manager = \
-            get_current_hub().push_scope().__enter__()
-    except Exception:
-        get_current_hub().capture_internal_exception()
+    get_current_hub().push_scope()
+    _app_ctx_stack.top._sentry_app_scope_pushed = True
 
 
 def _pop_appctx(exception):
-    try:
-        assert getattr(
-            _app_ctx_stack.top,
-            '_sentry_app_scope_manager',
-            None
-        ) is not None, 'race condition'
-        _app_ctx_stack.top._sentry_app_scope_manager.__exit__(None, None, None)
-        _app_ctx_stack.top._sentry_app_scope_manager = None
-    except Exception:
-        get_current_hub().capture_internal_exception()
+    get_current_hub().pop_scope_unsafe()
 
 
 def _capture_exception(sender, exception, **kwargs):
@@ -64,9 +47,9 @@ def _before_request(*args, **kwargs):
     try:
         assert getattr(
             _app_ctx_stack.top,
-            '_sentry_app_scope_manager',
+            '_sentry_app_scope_pushed',
             None
-        ) is not None, 'scope push failed'
+        ), 'scope push failed'
 
         with configure_scope() as scope:
             if request.url_rule:
