Cleanup

Author: antonpirker

sentry_sdk/integrations/starlette.py

@@ -366,16 +366,10 @@ def patch_middlewares():
         def _sentry_middleware_init(self, cls, *args, **kwargs):
             # type: (Any, Any, Any, Any) -> None
             if cls == SentryAsgiMiddleware:
-                if StarletteIntegration.starlette_version < (0, 35):
-                    return old_middleware_init(self, cls, **kwargs)
-                else:
-                    return old_middleware_init(self, cls, *args, **kwargs)
+                return old_middleware_init(self, cls, *args, **kwargs)
 
             span_enabled_cls = _enable_span_for_middleware(cls)
-            if StarletteIntegration.starlette_version < (0, 35):
-                old_middleware_init(self, span_enabled_cls, **kwargs)
-            else:
-                old_middleware_init(self, span_enabled_cls, *args, **kwargs)
+            old_middleware_init(self, span_enabled_cls, *args, **kwargs)
 
             if cls == AuthenticationMiddleware:
                 patch_authentication_middleware(cls)

tests/integrations/starlette/test_starlette.py

@@ -31,7 +31,6 @@
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.middleware.trustedhost import TrustedHostMiddleware
 from starlette.testclient import TestClient
-
 from tests.integrations.conftest import parametrize_test_configurable_status_codes
 
 
@@ -868,7 +867,11 @@ def test_middleware_partial_receive_send(sentry_init, capture_events):
         idx += 1
 
 
-def test_middleware_args(sentry_init):
+@pytest.mark.skipif(
+    STARLETTE_VERSION < (0, 35),
+    reason="Positional args for middleware have been introduced in Starlette >= 0.35",
+)
+def test_middleware_positional_args(sentry_init):
     sentry_init(
         traces_sample_rate=1.0,
         integrations=[StarletteIntegration()],