Fix FastAPI/Starlette middleware with positional arguments.

sentry_sdk/integrations/starlette.py

@@ -84,6 +84,7 @@ class StarletteIntegration(Integration):
     origin = f"auto.http.{identifier}"
 
     transaction_style = ""
+    starlette_version = None
 
     def __init__(
         self,
@@ -124,9 +125,9 @@ def __init__(
     @staticmethod
     def setup_once():
         # type: () -> None
-        version = parse_version(STARLETTE_VERSION)
+        StarletteIntegration.starlette_version = parse_version(STARLETTE_VERSION)
 
-        if version is None:
+        if StarletteIntegration.starlette_version is None:
             raise DidNotEnable(
                 "Unparsable Starlette version: {}".format(STARLETTE_VERSION)
             )
@@ -135,7 +136,7 @@ def setup_once():
         patch_asgi_app()
         patch_request_response()
 
-        if version >= (0, 24):
+        if StarletteIntegration.starlette_version >= (0, 24):
             patch_templates()
 
 
@@ -362,13 +363,19 @@ def patch_middlewares():
 
     if not_yet_patched:
 
-        def _sentry_middleware_init(self, cls, **options):
-            # type: (Any, Any, Any) -> None
+        def _sentry_middleware_init(self, cls, *args, **kwargs):
+            # type: (Any, Any, Any, Any) -> None
             if cls == SentryAsgiMiddleware:
-                return old_middleware_init(self, cls, **options)
+                if StarletteIntegration.starlette_version < (0, 35):
+                    return old_middleware_init(self, cls, **kwargs)
+                else:
+                    return old_middleware_init(self, cls, *args, **kwargs)
 
             span_enabled_cls = _enable_span_for_middleware(cls)
-            old_middleware_init(self, span_enabled_cls, **options)
+            if StarletteIntegration.starlette_version < (0, 35):
+                old_middleware_init(self, span_enabled_cls, **kwargs)
+            else:
+                old_middleware_init(self, span_enabled_cls, *args, **kwargs)
 
             if cls == AuthenticationMiddleware:
                 patch_authentication_middleware(cls)

tests/integrations/starlette/test_starlette.py

@@ -238,6 +238,12 @@ async def do_stuff(message):
         await self.app(scope, receive, do_stuff)
 
 
+class SampleMiddlewareWithArgs(Middleware):
+    def __init__(self, app, bla):
+        self.app = app
+        self.bla = bla
+
+
 class SampleReceiveSendMiddleware:
     def __init__(self, app):
         self.app = app
@@ -862,6 +868,20 @@ def test_middleware_partial_receive_send(sentry_init, capture_events):
         idx += 1
 
 
+def test_middleware_args(sentry_init):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[StarletteIntegration()],
+    )
+    _ = starlette_app_factory(
+        middleware=[Middleware(SampleMiddlewareWithArgs, "bla", "ba")]
+    )
+
+    # Only creating the App with an Middleware with args
+    # should not raise an error
+    # So as long as test passes, we are good
+
+
 def test_legacy_setup(
     sentry_init,
     capture_events,