Merge branch 'master' into aliu/rename-ff-module

.github/workflows/test-integrations-web-2.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.8","3.11","3.12","3.13"]
+        python-version: ["3.6","3.7","3.8","3.9","3.11","3.12","3.13"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6

sentry_sdk/integrations/arq.py

@@ -71,6 +71,7 @@ def setup_once():
 def patch_enqueue_job():
     # type: () -> None
     old_enqueue_job = ArqRedis.enqueue_job
+    original_kwdefaults = old_enqueue_job.__kwdefaults__
 
     async def _sentry_enqueue_job(self, function, *args, **kwargs):
         # type: (ArqRedis, str, *Any, **Any) -> Optional[Job]
@@ -83,6 +84,7 @@ async def _sentry_enqueue_job(self, function, *args, **kwargs):
         ):
             return await old_enqueue_job(self, function, *args, **kwargs)
 
+    _sentry_enqueue_job.__kwdefaults__ = original_kwdefaults
     ArqRedis.enqueue_job = _sentry_enqueue_job
 
 

tox.ini

@@ -247,9 +247,8 @@ envlist =
     # Sanic
     {py3.6,py3.7}-sanic-v{0.8}
     {py3.6,py3.8}-sanic-v{20}
-    {py3.7,py3.11}-sanic-v{22}
-    {py3.7,py3.11}-sanic-v{23}
-    {py3.8,py3.11,py3.12}-sanic-latest
+    {py3.8,py3.11,py3.12}-sanic-v{24.6}
+    {py3.9,py3.12,py3.13}-sanic-latest
 
     # Spark
     {py3.8,py3.10,py3.11}-spark-v{3.1,3.3,3.5}
@@ -652,13 +651,12 @@ deps =
     # Sanic
     sanic: websockets<11.0
     sanic: aiohttp
-    sanic-v{22,23}: sanic_testing
+    sanic-v{24.6}: sanic_testing
     sanic-latest: sanic_testing
     {py3.6}-sanic: aiocontextvars==0.2.1
     sanic-v0.8: sanic~=0.8.0
     sanic-v20: sanic~=20.0
-    sanic-v22: sanic~=22.0
-    sanic-v23: sanic~=23.0
+    sanic-v24.6: sanic~=24.6.0
     sanic-latest: sanic
 
     # Spark