Merge branch 'master' into antonpirker/fix/cloud_resource_context_timeout

Author: antonpirker

sentry_sdk/integrations/starlette.py

@@ -362,13 +362,13 @@ 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)
+                return old_middleware_init(self, cls, *args, **kwargs)
 
             span_enabled_cls = _enable_span_for_middleware(cls)
-            old_middleware_init(self, span_enabled_cls, **options)
+            old_middleware_init(self, span_enabled_cls, *args, **kwargs)
 
             if cls == AuthenticationMiddleware:
                 patch_authentication_middleware(cls)

sentry_sdk/tracing.py

@@ -1052,7 +1052,7 @@ def set_measurement(self, name, value, unit=""):
         self._measurements[name] = {"value": value, "unit": unit}
 
     def set_context(self, key, value):
-        # type: (str, Any) -> None
+        # type: (str, dict[str, Any]) -> None
         """Sets a context. Transactions can have multiple contexts
         and they should follow the format described in the "Contexts Interface"
         documentation.
@@ -1287,7 +1287,7 @@ def set_measurement(self, name, value, unit=""):
         pass
 
     def set_context(self, key, value):
-        # type: (str, Any) -> None
+        # type: (str, dict[str, Any]) -> None
         pass
 
     def init_span_recorder(self, maxlen):

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
 
 
@@ -238,6 +237,12 @@ async def do_stuff(message):
         await self.app(scope, receive, do_stuff)
 
 
+class SampleMiddlewareWithArgs(Middleware):
+    def __init__(self, app, bla=None):
+        self.app = app
+        self.bla = bla
+
+
 class SampleReceiveSendMiddleware:
     def __init__(self, app):
         self.app = app
@@ -862,6 +867,22 @@ def test_middleware_partial_receive_send(sentry_init, capture_events):
         idx += 1
 
 
+@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()],
+    )
+    _ = starlette_app_factory(middleware=[Middleware(SampleMiddlewareWithArgs, "bla")])
+
+    # 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,

tox.ini

@@ -10,7 +10,7 @@
 # The file (and all resulting CI YAMLs) then need to be regenerated via
 # "scripts/generate-test-files.sh".
 #
-# Last generated: 2025-02-19T12:41:15.689786+00:00
+# Last generated: 2025-03-10T11:46:25.287445+00:00
 
 [tox]
 requires =
@@ -181,7 +181,7 @@ envlist =
     {py3.6}-pymongo-v3.5.1
     {py3.6,py3.10,py3.11}-pymongo-v3.13.0
     {py3.6,py3.9,py3.10}-pymongo-v4.0.2
-    {py3.9,py3.12,py3.13}-pymongo-v4.11.1
+    {py3.9,py3.12,py3.13}-pymongo-v4.11.2
 
     {py3.6}-redis_py_cluster_legacy-v1.3.6
     {py3.6,py3.7}-redis_py_cluster_legacy-v2.0.0
@@ -202,42 +202,45 @@ envlist =
 
     {py3.7,py3.12,py3.13}-statsig-v0.55.3
     {py3.7,py3.12,py3.13}-statsig-v0.56.0
+    {py3.7,py3.12,py3.13}-statsig-v0.57.1
 
     {py3.8,py3.12,py3.13}-unleash-v6.0.1
     {py3.8,py3.12,py3.13}-unleash-v6.1.0
+    {py3.8,py3.12,py3.13}-unleash-v6.2.0
 
 
     # ~~~ GraphQL ~~~
     {py3.8,py3.10,py3.11}-ariadne-v0.20.1
     {py3.8,py3.11,py3.12}-ariadne-v0.22
     {py3.8,py3.11,py3.12}-ariadne-v0.24.0
-    {py3.9,py3.12,py3.13}-ariadne-v0.26.0
+    {py3.9,py3.12,py3.13}-ariadne-v0.26.1
 
     {py3.6,py3.9,py3.10}-gql-v3.4.1
-    {py3.7,py3.11,py3.12}-gql-v3.5.0
+    {py3.7,py3.11,py3.12}-gql-v3.5.2
     {py3.9,py3.12,py3.13}-gql-v3.6.0b4
 
     {py3.6,py3.9,py3.10}-graphene-v3.3
     {py3.8,py3.12,py3.13}-graphene-v3.4.3
 
     {py3.8,py3.10,py3.11}-strawberry-v0.209.8
-    {py3.8,py3.11,py3.12}-strawberry-v0.226.2
-    {py3.8,py3.11,py3.12}-strawberry-v0.243.1
-    {py3.9,py3.12,py3.13}-strawberry-v0.260.2
+    {py3.8,py3.11,py3.12}-strawberry-v0.227.7
+    {py3.8,py3.11,py3.12}-strawberry-v0.245.0
+    {py3.9,py3.12,py3.13}-strawberry-v0.262.1
 
 
     # ~~~ Network ~~~
     {py3.7,py3.8}-grpc-v1.32.0
     {py3.7,py3.9,py3.10}-grpc-v1.44.0
     {py3.7,py3.10,py3.11}-grpc-v1.58.3
     {py3.8,py3.12,py3.13}-grpc-v1.70.0
+    {py3.9,py3.12,py3.13}-grpc-v1.71.0rc2
 
 
     # ~~~ Tasks ~~~
     {py3.6,py3.7,py3.8}-celery-v4.4.7
     {py3.6,py3.7,py3.8}-celery-v5.0.5
     {py3.8,py3.11,py3.12}-celery-v5.4.0
-    {py3.8,py3.12,py3.13}-celery-v5.5.0rc4
+    {py3.8,py3.12,py3.13}-celery-v5.5.0rc5
 
     {py3.6,py3.7}-dramatiq-v1.9.0
     {py3.6,py3.8,py3.9}-dramatiq-v1.12.3
@@ -247,7 +250,7 @@ envlist =
     {py3.8,py3.9}-spark-v3.0.3
     {py3.8,py3.9}-spark-v3.2.4
     {py3.8,py3.10,py3.11}-spark-v3.4.4
-    {py3.8,py3.10,py3.11}-spark-v3.5.4
+    {py3.8,py3.10,py3.11}-spark-v3.5.5
 
 
     # ~~~ Web 1 ~~~
@@ -259,7 +262,7 @@ envlist =
     {py3.6,py3.9,py3.10}-starlette-v0.16.0
     {py3.7,py3.10,py3.11}-starlette-v0.26.1
     {py3.8,py3.11,py3.12}-starlette-v0.36.3
-    {py3.9,py3.12,py3.13}-starlette-v0.45.3
+    {py3.9,py3.12,py3.13}-starlette-v0.46.1
 
 
     # ~~~ Web 2 ~~~
@@ -294,9 +297,9 @@ envlist =
     {py3.6,py3.7,py3.8}-trytond-v5.8.16
     {py3.8,py3.10,py3.11}-trytond-v6.8.17
     {py3.8,py3.11,py3.12}-trytond-v7.0.9
-    {py3.8,py3.11,py3.12}-trytond-v7.4.6
+    {py3.8,py3.11,py3.12}-trytond-v7.4.7
 
-    {py3.7,py3.11,py3.12}-typer-v0.15.1
+    {py3.7,py3.12,py3.13}-typer-v0.15.2
 
 
 
@@ -562,7 +565,7 @@ deps =
     pymongo-v3.5.1: pymongo==3.5.1
     pymongo-v3.13.0: pymongo==3.13.0
     pymongo-v4.0.2: pymongo==4.0.2
-    pymongo-v4.11.1: pymongo==4.11.1
+    pymongo-v4.11.2: pymongo==4.11.2
     pymongo: mockupdb
 
     redis_py_cluster_legacy-v1.3.6: redis-py-cluster==1.3.6
@@ -584,23 +587,25 @@ deps =
 
     statsig-v0.55.3: statsig==0.55.3
     statsig-v0.56.0: statsig==0.56.0
+    statsig-v0.57.1: statsig==0.57.1
     statsig: typing_extensions
 
     unleash-v6.0.1: UnleashClient==6.0.1
     unleash-v6.1.0: UnleashClient==6.1.0
+    unleash-v6.2.0: UnleashClient==6.2.0
 
 
     # ~~~ GraphQL ~~~
     ariadne-v0.20.1: ariadne==0.20.1
     ariadne-v0.22: ariadne==0.22
     ariadne-v0.24.0: ariadne==0.24.0
-    ariadne-v0.26.0: ariadne==0.26.0
+    ariadne-v0.26.1: ariadne==0.26.1
     ariadne: fastapi
     ariadne: flask
     ariadne: httpx
 
     gql-v3.4.1: gql[all]==3.4.1
-    gql-v3.5.0: gql[all]==3.5.0
+    gql-v3.5.2: gql[all]==3.5.2
     gql-v3.6.0b4: gql[all]==3.6.0b4
 
     graphene-v3.3: graphene==3.3
@@ -612,9 +617,9 @@ deps =
     py3.6-graphene: aiocontextvars
 
     strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
-    strawberry-v0.226.2: strawberry-graphql[fastapi,flask]==0.226.2
-    strawberry-v0.243.1: strawberry-graphql[fastapi,flask]==0.243.1
-    strawberry-v0.260.2: strawberry-graphql[fastapi,flask]==0.260.2
+    strawberry-v0.227.7: strawberry-graphql[fastapi,flask]==0.227.7
+    strawberry-v0.245.0: strawberry-graphql[fastapi,flask]==0.245.0
+    strawberry-v0.262.1: strawberry-graphql[fastapi,flask]==0.262.1
     strawberry: httpx
 
 
@@ -623,6 +628,7 @@ deps =
     grpc-v1.44.0: grpcio==1.44.0
     grpc-v1.58.3: grpcio==1.58.3
     grpc-v1.70.0: grpcio==1.70.0
+    grpc-v1.71.0rc2: grpcio==1.71.0rc2
     grpc: protobuf
     grpc: mypy-protobuf
     grpc: types-protobuf
@@ -633,7 +639,7 @@ deps =
     celery-v4.4.7: celery==4.4.7
     celery-v5.0.5: celery==5.0.5
     celery-v5.4.0: celery==5.4.0
-    celery-v5.5.0rc4: celery==5.5.0rc4
+    celery-v5.5.0rc5: celery==5.5.0rc5
     celery: newrelic
     celery: redis
     py3.7-celery: importlib-metadata<5.0
@@ -646,7 +652,7 @@ deps =
     spark-v3.0.3: pyspark==3.0.3
     spark-v3.2.4: pyspark==3.2.4
     spark-v3.4.4: pyspark==3.4.4
-    spark-v3.5.4: pyspark==3.5.4
+    spark-v3.5.5: pyspark==3.5.5
 
 
     # ~~~ Web 1 ~~~
@@ -662,7 +668,7 @@ deps =
     starlette-v0.16.0: starlette==0.16.0
     starlette-v0.26.1: starlette==0.26.1
     starlette-v0.36.3: starlette==0.36.3
-    starlette-v0.45.3: starlette==0.45.3
+    starlette-v0.46.1: starlette==0.46.1
     starlette: pytest-asyncio
     starlette: python-multipart
     starlette: requests
@@ -720,12 +726,12 @@ deps =
     trytond-v5.8.16: trytond==5.8.16
     trytond-v6.8.17: trytond==6.8.17
     trytond-v7.0.9: trytond==7.0.9
-    trytond-v7.4.6: trytond==7.4.6
+    trytond-v7.4.7: trytond==7.4.7
     trytond: werkzeug
     trytond-v4.6.9: werkzeug<1.0
     trytond-v4.8.18: werkzeug<1.0
 
-    typer-v0.15.1: typer==0.15.1
+    typer-v0.15.2: typer==0.15.2