Do not set and then overwrite middlewares __call__

Author: sentrivana

sentry_sdk/integrations/asgi.py

@@ -42,7 +42,6 @@
 
 if TYPE_CHECKING:
     from typing import Any
-    from typing import Callable
     from typing import Dict
     from typing import Optional
     from typing import Tuple
@@ -102,6 +101,7 @@ def __init__(
         mechanism_type="asgi",  # type: str
         span_origin="manual",  # type: str
         http_methods_to_capture=DEFAULT_HTTP_METHODS_TO_CAPTURE,  # type: Tuple[str, ...]
+        asgi_version=None,  # type: Optional[int]
     ):
         # type: (...) -> None
         """
@@ -140,9 +140,15 @@ def __init__(
         self.app = app
         self.http_methods_to_capture = http_methods_to_capture
 
-        if _looks_like_asgi3(app):
-            self.__call__ = self._run_asgi3  # type: Callable[..., Any]
-        else:
+        if asgi_version is None:
+            if _looks_like_asgi3(app):
+                asgi_version = 3
+            else:
+                asgi_version = 2
+
+        if asgi_version == 3:
+            self.__call__ = self._run_asgi3
+        elif asgi_version == 2:
             self.__call__ = self._run_asgi2
 
     def _capture_lifespan_exception(self, exc):

sentry_sdk/integrations/starlette.py

@@ -403,9 +403,9 @@ async def _sentry_patched_asgi_app(self, scope, receive, send):
                 if integration
                 else DEFAULT_HTTP_METHODS_TO_CAPTURE
             ),
+            asgi_version=3,
         )
 
-        middleware.__call__ = middleware._run_asgi3
         return await middleware(scope, receive, send)
 
     Starlette.__call__ = _sentry_patched_asgi_app