ref(client): Properly add client changes for sync flush

GH-4601

Author: srothh

sentry_sdk/client.py

@@ -1023,8 +1023,6 @@ async def _flush_async(
         self.session_flusher.flush()
         if self.log_batcher is not None:
             self.log_batcher.flush()
-
-        # For async transport, flush() returns a Task that needs to be awaited
         flush_task = self.transport.flush(timeout=timeout, callback=callback)  # type: ignore
         if flush_task is not None:
             await flush_task

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-07-29T08:45:43.951088+00:00
+# Last generated: 2025-07-30T13:59:12.959550+00:00
 
 [tox]
 requires =
@@ -125,9 +125,9 @@ envlist =
 
     # ~~~ Common ~~~
     {py3.7,py3.8,py3.9}-common-v1.4.1
-    {py3.7,py3.8,py3.9,py3.10,py3.11}-common-v1.14.0
-    {py3.8,py3.9,py3.10,py3.11}-common-v1.24.0
-    {py3.9,py3.10,py3.11,py3.12,py3.13}-common-v1.35.0
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-common-v1.15.0
+    {py3.8,py3.9,py3.10,py3.11,py3.12}-common-v1.26.0
+    {py3.9,py3.10,py3.11,py3.12,py3.13}-common-v1.36.0
 
 
     # ~~~ AI ~~~
@@ -141,9 +141,9 @@ envlist =
     {py3.9,py3.11,py3.12}-cohere-v5.13.12
     {py3.9,py3.11,py3.12}-cohere-v5.16.1
 
-    {py3.9,py3.11,py3.12}-openai_agents-v0.0.19
-    {py3.9,py3.12,py3.13}-openai_agents-v0.1.0
-    {py3.9,py3.12,py3.13}-openai_agents-v0.2.3
+    {py3.10,py3.11,py3.12}-openai_agents-v0.0.19
+    {py3.10,py3.12,py3.13}-openai_agents-v0.1.0
+    {py3.10,py3.12,py3.13}-openai_agents-v0.2.4
 
     {py3.8,py3.10,py3.11}-huggingface_hub-v0.22.2
     {py3.8,py3.11,py3.12}-huggingface_hub-v0.26.5
@@ -165,7 +165,7 @@ envlist =
 
     {py3.7,py3.8,py3.9}-sqlalchemy-v1.3.24
     {py3.7,py3.11,py3.12}-sqlalchemy-v1.4.54
-    {py3.7,py3.12,py3.13}-sqlalchemy-v2.0.41
+    {py3.7,py3.12,py3.13}-sqlalchemy-v2.0.42
 
 
     # ~~~ Flags ~~~
@@ -205,9 +205,6 @@ envlist =
     {py3.8,py3.11,py3.12}-strawberry-v0.232.2
     {py3.8,py3.12,py3.13}-strawberry-v0.255.0
     {py3.9,py3.12,py3.13}-strawberry-v0.278.0
-    {py3.8,py3.11,py3.12}-strawberry-v0.232.2
-    {py3.8,py3.12,py3.13}-strawberry-v0.255.0
-    {py3.9,py3.12,py3.13}-strawberry-v0.278.0
 
 
     # ~~~ Network ~~~
@@ -254,7 +251,6 @@ envlist =
     {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.47.2
-    {py3.9,py3.12,py3.13}-starlette-v0.47.2
 
     {py3.7,py3.9,py3.10}-fastapi-v0.79.1
     {py3.7,py3.10,py3.11}-fastapi-v0.91.0
@@ -275,7 +271,6 @@ envlist =
     {py3.7,py3.11,py3.12}-falcon-v3.1.3
     {py3.8,py3.11,py3.12}-falcon-v4.0.2
     {py3.8,py3.11,py3.12}-falcon-v4.1.0a3
-    {py3.8,py3.11,py3.12}-falcon-v4.1.0a3
 
     {py3.8,py3.10,py3.11}-litestar-v2.0.1
     {py3.8,py3.11,py3.12}-litestar-v2.5.5
@@ -304,8 +299,6 @@ envlist =
     {py3.8,py3.10,py3.11}-trytond-v6.8.17
     {py3.8,py3.11,py3.12}-trytond-v7.0.34
     {py3.9,py3.12,py3.13}-trytond-v7.6.4
-    {py3.8,py3.11,py3.12}-trytond-v7.0.34
-    {py3.9,py3.12,py3.13}-trytond-v7.6.4
 
     {py3.7,py3.12,py3.13}-typer-v0.15.4
     {py3.7,py3.12,py3.13}-typer-v0.16.0
@@ -491,9 +484,9 @@ deps =
 
     # ~~~ Common ~~~
     common-v1.4.1: opentelemetry-sdk==1.4.1
-    common-v1.14.0: opentelemetry-sdk==1.14.0
-    common-v1.24.0: opentelemetry-sdk==1.24.0
-    common-v1.35.0: opentelemetry-sdk==1.35.0
+    common-v1.15.0: opentelemetry-sdk==1.15.0
+    common-v1.26.0: opentelemetry-sdk==1.26.0
+    common-v1.36.0: opentelemetry-sdk==1.36.0
     common: pytest
     common: pytest-asyncio
     py3.7-common: pytest<7.0.0
@@ -517,8 +510,7 @@ deps =
 
     openai_agents-v0.0.19: openai-agents==0.0.19
     openai_agents-v0.1.0: openai-agents==0.1.0
-    openai_agents-v0.2.3: openai-agents==0.2.3
-    openai_agents-v0.2.3: openai-agents==0.2.3
+    openai_agents-v0.2.4: openai-agents==0.2.4
     openai_agents: pytest-asyncio
 
     huggingface_hub-v0.22.2: huggingface_hub==0.22.2
@@ -542,7 +534,7 @@ deps =
 
     sqlalchemy-v1.3.24: sqlalchemy==1.3.24
     sqlalchemy-v1.4.54: sqlalchemy==1.4.54
-    sqlalchemy-v2.0.41: sqlalchemy==2.0.41
+    sqlalchemy-v2.0.42: sqlalchemy==2.0.42
 
 
     # ~~~ Flags ~~~
@@ -591,15 +583,10 @@ deps =
     strawberry-v0.232.2: strawberry-graphql[fastapi,flask]==0.232.2
     strawberry-v0.255.0: strawberry-graphql[fastapi,flask]==0.255.0
     strawberry-v0.278.0: strawberry-graphql[fastapi,flask]==0.278.0
-    strawberry-v0.232.2: strawberry-graphql[fastapi,flask]==0.232.2
-    strawberry-v0.255.0: strawberry-graphql[fastapi,flask]==0.255.0
-    strawberry-v0.278.0: strawberry-graphql[fastapi,flask]==0.278.0
     strawberry: httpx
     strawberry-v0.209.8: pydantic<2.11
     strawberry-v0.232.2: pydantic<2.11
     strawberry-v0.255.0: pydantic<2.11
-    strawberry-v0.232.2: pydantic<2.11
-    strawberry-v0.255.0: pydantic<2.11
 
 
     # ~~~ Network ~~~
@@ -680,7 +667,6 @@ deps =
     starlette-v0.26.1: starlette==0.26.1
     starlette-v0.36.3: starlette==0.36.3
     starlette-v0.47.2: starlette==0.47.2
-    starlette-v0.47.2: starlette==0.47.2
     starlette: pytest-asyncio
     starlette: python-multipart
     starlette: requests
@@ -725,7 +711,6 @@ deps =
     falcon-v3.1.3: falcon==3.1.3
     falcon-v4.0.2: falcon==4.0.2
     falcon-v4.1.0a3: falcon==4.1.0a3
-    falcon-v4.1.0a3: falcon==4.1.0a3
 
     litestar-v2.0.1: litestar==2.0.1
     litestar-v2.5.5: litestar==2.5.5
@@ -771,8 +756,6 @@ deps =
     trytond-v6.8.17: trytond==6.8.17
     trytond-v7.0.34: trytond==7.0.34
     trytond-v7.6.4: trytond==7.6.4
-    trytond-v7.0.34: trytond==7.0.34
-    trytond-v7.6.4: trytond==7.6.4
     trytond: werkzeug
     trytond-v5.0.63: werkzeug<1.0