ref(flask): Use new scopes API in Flask (#2863)

Author: sentrivana

sentry_sdk/integrations/flask.py

@@ -1,12 +1,13 @@
+import sentry_sdk
 from sentry_sdk._types import TYPE_CHECKING
-from sentry_sdk.hub import Hub, _should_send_default_pii
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.integrations._wsgi_common import RequestExtractor
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
-from sentry_sdk.scope import Scope
+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,
     package_version,
 )
@@ -75,11 +76,9 @@ def setup_once():
 
         old_app = Flask.__call__
 
+        @ensure_integration_enabled(FlaskIntegration, old_app)
         def sentry_patched_wsgi_app(self, environ, start_response):
             # type: (Any, Dict[str, str], Callable[..., Any]) -> _ScopedResponse
-            if Hub.current.get_integration(FlaskIntegration) is None:
-                return old_app(self, environ, start_response)
-
             return SentryWsgiMiddleware(lambda *a, **kw: old_app(self, *a, **kw))(
                 environ, start_response
             )
@@ -92,8 +91,8 @@ def _add_sentry_trace(sender, template, context, **extra):
     if "sentry_trace" in context:
         return
 
-    hub = Hub.current
-    trace_meta = Markup(hub.trace_propagation_meta())
+    scope = Scope.get_current_scope()
+    trace_meta = Markup(scope.trace_propagation_meta())
     context["sentry_trace"] = trace_meta  # for backwards compatibility
     context["sentry_trace_meta"] = trace_meta
 
@@ -115,8 +114,7 @@ def _set_transaction_name_and_source(scope, transaction_style, request):
 
 def _request_started(app, **kwargs):
     # type: (Flask, **Any) -> None
-    hub = Hub.current
-    integration = hub.get_integration(FlaskIntegration)
+    integration = sentry_sdk.get_client().get_integration(FlaskIntegration)
     if integration is None:
         return
 
@@ -128,9 +126,10 @@ def _request_started(app, **kwargs):
         Scope.get_current_scope(), integration.transaction_style, request
     )
 
-    with hub.configure_scope() as scope:
-        evt_processor = _make_request_event_processor(app, request, integration)
-        scope.add_event_processor(evt_processor)
+    scope = Scope.get_isolation_scope()
+    scope.generate_propagation_context()
+    evt_processor = _make_request_event_processor(app, request, integration)
+    scope.add_event_processor(evt_processor)
 
 
 class FlaskRequestExtractor(RequestExtractor):
@@ -185,7 +184,7 @@ def inner(event, hint):
         with capture_internal_exceptions():
             FlaskRequestExtractor(request).extract_into_event(event)
 
-        if _should_send_default_pii():
+        if should_send_default_pii():
             with capture_internal_exceptions():
                 _add_user_to_event(event)
 
@@ -196,20 +195,17 @@ def inner(event, hint):
 
 def _capture_exception(sender, exception, **kwargs):
     # type: (Flask, Union[ValueError, BaseException], **Any) -> None
-    hub = Hub.current
-    if hub.get_integration(FlaskIntegration) is None:
+    client = sentry_sdk.get_client()
+    if client.get_integration(FlaskIntegration) is None:
         return
 
-    # If an integration is there, a client has to be there.
-    client = hub.client  # type: Any
-
     event, hint = event_from_exception(
         exception,
         client_options=client.options,
         mechanism={"type": "flask", "handled": False},
     )
 
-    hub.capture_event(event, hint=hint)
+    sentry_sdk.capture_event(event, hint=hint)
 
 
 def _add_user_to_event(event):

tests/integrations/flask/test_flask.py

@@ -20,15 +20,16 @@
 except ImportError:
     UnsupportedMediaType = None
 
+import sentry_sdk
 import sentry_sdk.integrations.flask as flask_sentry
 from sentry_sdk import (
     set_tag,
     configure_scope,
     capture_message,
     capture_exception,
-    Hub,
 )
 from sentry_sdk.integrations.logging import LoggingIntegration
+from sentry_sdk.scope import Scope
 from sentry_sdk.serializer import MAX_DATABAG_BREADTH
 
 
@@ -294,7 +295,7 @@ def index():
         except ZeroDivisionError:
             pass
 
-    Hub.current.client.flush()
+    sentry_sdk.get_client().flush()
 
     (first_event, error_event, session) = envelopes
     first_event = first_event.get_event()
@@ -838,8 +839,10 @@ def test_template_tracing_meta(sentry_init, app, capture_events, template_string
 
     @app.route("/")
     def index():
-        hub = Hub.current
-        capture_message(hub.get_traceparent() + "\n" + hub.get_baggage())
+        scope = Scope.get_isolation_scope()
+        capture_message(
+            scope.get_traceparent() + "\n" + scope.get_baggage().serialize()
+        )
         return render_template_string(template_string)
 
     with app.test_client() as client:
@@ -916,7 +919,7 @@ def test_response_status_code_ok_in_transaction_context(
     client = app.test_client()
     client.get("/message")
 
-    Hub.current.client.flush()
+    sentry_sdk.get_client().flush()
 
     (_, transaction_envelope, _) = envelopes
     transaction = transaction_envelope.get_transaction_event()
@@ -943,7 +946,7 @@ def test_response_status_code_not_found_in_transaction_context(
     client = app.test_client()
     client.get("/not-existing-route")
 
-    Hub.current.client.flush()
+    sentry_sdk.get_client().flush()
 
     (transaction_envelope, _) = envelopes
     transaction = transaction_envelope.get_transaction_event()