remove monkey patching for quart for another PR

Author: Zylphrex

sentry_sdk/integrations/quart.py

@@ -1,8 +1,5 @@
 from __future__ import absolute_import
 
-import inspect
-import threading
-
 from sentry_sdk.hub import _should_send_default_pii, Hub
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.integrations._wsgi_common import _filter_headers
@@ -14,7 +11,6 @@
     event_from_exception,
 )
 
-from sentry_sdk._functools import wraps
 from sentry_sdk._types import MYPY
 
 if MYPY:
@@ -38,15 +34,13 @@
         request,
         websocket,
     )
-    from quart.scaffold import Scaffold  # type: ignore
     from quart.signals import (  # type: ignore
         got_background_exception,
         got_request_exception,
         got_websocket_exception,
         request_started,
         websocket_started,
     )
-    from quart.utils import is_coroutine_function  # type: ignore
 except ImportError:
     raise DidNotEnable("Quart is not installed")
 
@@ -77,62 +71,18 @@ def setup_once():
         got_request_exception.connect(_capture_exception)
         got_websocket_exception.connect(_capture_exception)
 
-        patch_asgi_app()
-        patch_scaffold_route()
-
-
-def patch_asgi_app():
-    # type: () -> None
-    old_app = Quart.__call__
-
-    async def sentry_patched_asgi_app(self, scope, receive, send):
-        # type: (Any, Any, Any, Any) -> Any
-        if Hub.current.get_integration(QuartIntegration) is None:
-            return await old_app(self, scope, receive, send)
-
-        middleware = SentryAsgiMiddleware(lambda *a, **kw: old_app(self, *a, **kw))
-        middleware.__call__ = middleware._run_asgi3
-        return await middleware(scope, receive, send)
-
-    Quart.__call__ = sentry_patched_asgi_app
-
-
-def patch_scaffold_route():
-    # type: () -> None
-    old_route = Scaffold.route
-
-    def _sentry_route(*args, **kwargs):
-        # type: (*Any, **Any) -> Any
-        old_decorator = old_route(*args, **kwargs)
-
-        def decorator(old_func):
-            # type: (Any) -> Any
-
-            if inspect.isfunction(old_func) and not is_coroutine_function(old_func):
-
-                @wraps(old_func)
-                def _sentry_func(*args, **kwargs):
-                    # type: (*Any, **Any) -> Any
-                    hub = Hub.current
-                    integration = hub.get_integration(QuartIntegration)
-                    if integration is None:
-                        return old_func(*args, **kwargs)
-
-                    with hub.configure_scope() as sentry_scope:
-                        if sentry_scope.profile is not None:
-                            sentry_scope.profile.active_thread_id = (
-                                threading.current_thread().ident
-                            )
-
-                        return old_func(*args, **kwargs)
-
-                return old_decorator(_sentry_func)
+        old_app = Quart.__call__
 
-            return old_decorator(old_func)
+        async def sentry_patched_asgi_app(self, scope, receive, send):
+            # type: (Any, Any, Any, Any) -> Any
+            if Hub.current.get_integration(QuartIntegration) is None:
+                return await old_app(self, scope, receive, send)
 
-        return decorator
+            middleware = SentryAsgiMiddleware(lambda *a, **kw: old_app(self, *a, **kw))
+            middleware.__call__ = middleware._run_asgi3
+            return await middleware(scope, receive, send)
 
-    Scaffold.route = _sentry_route
+        Quart.__call__ = sentry_patched_asgi_app
 
 
 def _set_transaction_name_and_source(scope, transaction_style, request):

tests/integrations/quart/test_quart.py

@@ -1,6 +1,3 @@
-import json
-import threading
-
 import pytest
 import pytest_asyncio
 
@@ -44,20 +41,6 @@ async def hi_with_id(message_id):
         capture_message("hi with id")
         return "ok with id"
 
-    @app.get("/sync/thread_ids")
-    def _thread_ids_sync():
-        return {
-            "main": str(threading.main_thread().ident),
-            "active": str(threading.current_thread().ident),
-        }
-
-    @app.get("/async/thread_ids")
-    async def _thread_ids_async():
-        return {
-            "main": str(threading.main_thread().ident),
-            "active": str(threading.current_thread().ident),
-        }
-
     return app
 
 
@@ -540,30 +523,3 @@ async def dispatch_request(self):
 
     assert event["message"] == "hi"
     assert event["transaction"] == "hello_class"
-
-
-@pytest.mark.parametrize("endpoint", ["/sync/thread_ids", "/async/thread_ids"])
-async def test_active_thread_id(sentry_init, capture_envelopes, endpoint, app):
-    sentry_init(
-        traces_sample_rate=1.0,
-        _experiments={"profiles_sample_rate": 1.0},
-    )
-
-    envelopes = capture_envelopes()
-
-    async with app.test_client() as client:
-        response = await client.get(endpoint)
-        assert response.status_code == 200
-
-    data = json.loads(response.content)
-
-    envelopes = [envelope for envelope in envelopes]
-    assert len(envelopes) == 1
-
-    profiles = [item for item in envelopes[0].items if item.type == "profile"]
-    assert len(profiles) == 1
-
-    for profile in profiles:
-        transactions = profile.payload.json["transactions"]
-        assert len(transactions) == 1
-        assert str(data["active"]) == transactions[0]["active_thread_id"]