fix: Make patched channels asgi app awaitable, fix integraton-disabled codepath (getsentry#598)

untitaker · web-flow · commit dbce2190fb6e · 2020-01-22T18:00:13.000+01:00
* fix: Make patched channels asgi app awaitable, fix integraton-disabled codepath

* fix: Fix linters

* fix: Reformatting
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
@@ -298,22 +298,9 @@ def _patch_channels():
             "Python 3.7+ or the aiocontextvars package from PyPI."
         )
 
-    from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
+    from sentry_sdk.integrations.django.asgi import patch_channels_asgi_handler_impl
 
-    old_app = AsgiHandler.__call__
-
-    def sentry_patched_asgi_handler(self, receive, send):
-        # type: (AsgiHandler, Any, Any) -> Any
-        if Hub.current.get_integration(DjangoIntegration) is None:
-            return old_app(receive, send)
-
-        middleware = SentryAsgiMiddleware(
-            lambda _scope: old_app.__get__(self, AsgiHandler)
-        )
-
-        return middleware(self.scope)(receive, send)
-
-    AsgiHandler.__call__ = sentry_patched_asgi_handler
+    patch_channels_asgi_handler_impl(AsgiHandler)
 
 
 def _patch_django_asgi_handler():
diff --git a/sentry_sdk/integrations/django/asgi.py b/sentry_sdk/integrations/django/asgi.py
@@ -29,3 +29,19 @@ async def sentry_patched_asgi_handler(self, scope, receive, send):
         return await middleware(scope, receive, send)
 
     cls.__call__ = sentry_patched_asgi_handler
+
+
+def patch_channels_asgi_handler_impl(cls):
+    # type: (Any) -> None
+    old_app = cls.__call__
+
+    async def sentry_patched_asgi_handler(self, receive, send):
+        # type: (Any, Any, Any) -> Any
+        if Hub.current.get_integration(DjangoIntegration) is None:
+            return await old_app(self, receive, send)
+
+        middleware = SentryAsgiMiddleware(lambda _scope: old_app.__get__(self, cls))
+
+        return await middleware(self.scope)(receive, send)
+
+    cls.__call__ = sentry_patched_asgi_handler
