Merge branch 'ivana/random-perf-improvements' into ivana/remove-decimal

Author: sentrivana

sentry_sdk/integrations/asgi.py

@@ -12,7 +12,6 @@
 import sentry_sdk
 from sentry_sdk.api import continue_trace
 from sentry_sdk.consts import OP
-
 from sentry_sdk.integrations._asgi_common import (
     _get_headers,
     _get_request_data,
@@ -150,7 +149,7 @@ def __init__(
         if asgi_version == 3:
             self.__call__ = self._run_asgi3
         elif asgi_version == 2:
-            self.__call__ = self._run_asgi2
+            self.__call__ = self._run_asgi2  # type: ignore
 
     def _capture_lifespan_exception(self, exc):
         # type: (Exception) -> None

sentry_sdk/integrations/django/asgi.py

@@ -155,7 +155,7 @@ async def sentry_patched_asgi_handler(self, receive, send):
                 http_methods_to_capture=integration.http_methods_to_capture,
             )
 
-            return await middleware(self.scope)(receive, send)
+            return await middleware(self.scope)(receive, send)  # type: ignore
 
         cls.__call__ = sentry_patched_asgi_handler
 

sentry_sdk/integrations/litestar.py

@@ -85,6 +85,7 @@ def __init__(self, app, span_origin=LitestarIntegration.origin):
             transaction_style="endpoint",
             mechanism_type="asgi",
             span_origin=span_origin,
+            asgi_version=3,
         )
 
     def _capture_request_exception(self, exc):
@@ -116,7 +117,6 @@ def injection_wrapper(self, *args, **kwargs):
             *(kwargs.get("after_exception") or []),
         ]
 
-        SentryLitestarASGIMiddleware.__call__ = SentryLitestarASGIMiddleware._run_asgi3  # type: ignore
         middleware = kwargs.get("middleware") or []
         kwargs["middleware"] = [SentryLitestarASGIMiddleware, *middleware]
         old__init__(self, *args, **kwargs)

sentry_sdk/integrations/starlite.py

@@ -65,6 +65,7 @@ def __init__(self, app, span_origin=StarliteIntegration.origin):
             transaction_style="endpoint",
             mechanism_type="asgi",
             span_origin=span_origin,
+            asgi_version=3,
         )
 
 
@@ -94,7 +95,6 @@ def injection_wrapper(self, *args, **kwargs):
             ]
         )
 
-        SentryStarliteASGIMiddleware.__call__ = SentryStarliteASGIMiddleware._run_asgi3  # type: ignore
         middleware = kwargs.get("middleware") or []
         kwargs["middleware"] = [SentryStarliteASGIMiddleware, *middleware]
         old__init__(self, *args, **kwargs)