ref(bottle): Use new scopes API (#2873)

Author: sentrivana

sentry_sdk/integrations/pyramid.py

@@ -2,25 +2,26 @@
 import sys
 import weakref
 
-from sentry_sdk.hub import Hub, _should_send_default_pii
-from sentry_sdk.scope import Scope
+import sentry_sdk
+from sentry_sdk.integrations import Integration, DidNotEnable
+from sentry_sdk.integrations._wsgi_common import RequestExtractor
+from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
+from sentry_sdk.scope import Scope, should_send_default_pii
 from sentry_sdk.tracing import SOURCE_FOR_STYLE
 from sentry_sdk.utils import (
     capture_internal_exceptions,
+    ensure_integration_enabled,
     event_from_exception,
     reraise,
 )
-from sentry_sdk.integrations import Integration, DidNotEnable
-from sentry_sdk.integrations._wsgi_common import RequestExtractor
-from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
+from sentry_sdk._types import TYPE_CHECKING
 
 try:
     from pyramid.httpexceptions import HTTPException
     from pyramid.request import Request
 except ImportError:
     raise DidNotEnable("Pyramid not installed")
 
-from sentry_sdk._types import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from pyramid.response import Response
@@ -73,17 +74,16 @@ def setup_once():
 
         def sentry_patched_call_view(registry, request, *args, **kwargs):
             # type: (Any, Request, *Any, **Any) -> Response
-            hub = Hub.current
-            integration = hub.get_integration(PyramidIntegration)
+            integration = sentry_sdk.get_client().get_integration(PyramidIntegration)
 
             if integration is not None:
                 _set_transaction_name_and_source(
                     Scope.get_current_scope(), integration.transaction_style, request
                 )
-                with hub.configure_scope() as scope:
-                    scope.add_event_processor(
-                        _make_event_processor(weakref.ref(request), integration)
-                    )
+                scope = Scope.get_isolation_scope()
+                scope.add_event_processor(
+                    _make_event_processor(weakref.ref(request), integration)
+                )
 
             return old_call_view(registry, request, *args, **kwargs)
 
@@ -100,7 +100,8 @@ def sentry_patched_invoke_exception_view(self, *args, **kwargs):
                     self.exc_info
                     and all(self.exc_info)
                     and rv.status_int == 500
-                    and Hub.current.get_integration(PyramidIntegration) is not None
+                    and sentry_sdk.get_client().get_integration(PyramidIntegration)
+                    is not None
                 ):
                     _capture_exception(self.exc_info)
 
@@ -110,13 +111,9 @@ def sentry_patched_invoke_exception_view(self, *args, **kwargs):
 
         old_wsgi_call = router.Router.__call__
 
+        @ensure_integration_enabled(PyramidIntegration, old_wsgi_call)
         def sentry_patched_wsgi_call(self, environ, start_response):
             # type: (Any, Dict[str, str], Callable[..., Any]) -> _ScopedResponse
-            hub = Hub.current
-            integration = hub.get_integration(PyramidIntegration)
-            if integration is None:
-                return old_wsgi_call(self, environ, start_response)
-
             def sentry_patched_inner_wsgi_call(environ, start_response):
                 # type: (Dict[str, Any], Callable[..., Any]) -> Any
                 try:
@@ -137,20 +134,18 @@ def _capture_exception(exc_info):
     # type: (ExcInfo) -> None
     if exc_info[0] is None or issubclass(exc_info[0], HTTPException):
         return
-    hub = Hub.current
-    if hub.get_integration(PyramidIntegration) is None:
-        return
 
-    # If an integration is there, a client has to be there.
-    client = hub.client  # type: Any
+    client = sentry_sdk.get_client()
+    if client.get_integration(PyramidIntegration) is None:
+        return
 
     event, hint = event_from_exception(
         exc_info,
         client_options=client.options,
         mechanism={"type": "pyramid", "handled": False},
     )
 
-    hub.capture_event(event, hint=hint)
+    sentry_sdk.capture_event(event, hint=hint)
 
 
 def _set_transaction_name_and_source(scope, transaction_style, request):
@@ -221,7 +216,7 @@ def pyramid_event_processor(event, hint):
         with capture_internal_exceptions():
             PyramidRequestExtractor(request).extract_into_event(event)
 
-        if _should_send_default_pii():
+        if should_send_default_pii():
             with capture_internal_exceptions():
                 user_info = event.setdefault("user", {})
                 user_info.setdefault("id", authenticated_userid(request))