Merge branch 'master' into webb/populate-tox/transitive-dependencies

alexander-alderman-webb · alexander-alderman-webb · commit 00e90a6ff783 · 2026-06-02T09:35:15.000+02:00
diff --git a/.github/workflows/test-integrations-agents.yml b/.github/workflows/test-integrations-agents.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: agents-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-ai-workflow.yml b/.github/workflows/test-integrations-ai-workflow.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: ai_workflow-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: ai-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-cloud.yml b/.github/workflows/test-integrations-cloud.yml
@@ -32,8 +32,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: cloud-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: common-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml
@@ -45,8 +45,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: dbs-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: "Setup ClickHouse Server"
         uses: getsentry/action-clickhouse-in-ci@5dc8a6a50d689bd6051db0241f34849e5a36490b # v1.7
       - name: Mark workspace safe for git (3.6/3.7 container)
diff --git a/.github/workflows/test-integrations-flags.yml b/.github/workflows/test-integrations-flags.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: flags-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-gevent.yml b/.github/workflows/test-integrations-gevent.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: gevent-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: graphql-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-mcp.yml b/.github/workflows/test-integrations-mcp.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: mcp-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-misc.yml b/.github/workflows/test-integrations-misc.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: misc-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-network.yml b/.github/workflows/test-integrations-network.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: network-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-tasks.yml b/.github/workflows/test-integrations-tasks.yml
@@ -39,8 +39,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: tasks-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Install Java
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
         with:
diff --git a/.github/workflows/test-integrations-web-1.yml b/.github/workflows/test-integrations-web-1.yml
@@ -45,8 +45,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: web_1-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/.github/workflows/test-integrations-web-2.yml b/.github/workflows/test-integrations-web-2.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: web_2-${{ matrix.python-version }}
-          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+          enable-cache: false
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
diff --git a/scripts/split_tox_gh_actions/templates/test_group.jinja b/scripts/split_tox_gh_actions/templates/test_group.jinja
@@ -59,8 +59,7 @@
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
-          cache-suffix: {{ lowercase_group }}-{% raw %}${{ matrix.python-version }}{% endraw %}
-          enable-cache: {% raw %}${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}{% endraw %}
+          enable-cache: false
 
       {% if needs_clickhouse %}
       - name: "Setup ClickHouse Server"
diff --git a/sentry_sdk/ai/utils.py b/sentry_sdk/ai/utils.py
@@ -609,7 +609,12 @@ def _is_image_type_with_blob_content(item: "Dict[str, Any]") -> bool:
     if item.get("type") != "image_url":
         return False
 
-    image_url = item.get("image_url", {}).get("url", "")
+    image_url_val = item.get("image_url")
+    image_url = (
+        image_url_val.get("url", "")
+        if isinstance(image_url_val, dict)
+        else (image_url_val or "")
+    )
     data_url_match = DATA_URL_BASE64_REGEX.match(image_url)
 
     return bool(data_url_match)
@@ -694,7 +699,10 @@ def redact_blob_message_parts(
                     if item.get("type") == "blob":
                         item["content"] = BLOB_DATA_SUBSTITUTE
                     elif _is_image_type_with_blob_content(item):
-                        item["image_url"]["url"] = BLOB_DATA_SUBSTITUTE
+                        if isinstance(item["image_url"], dict):
+                            item["image_url"]["url"] = BLOB_DATA_SUBSTITUTE
+                        else:
+                            item["image_url"] = BLOB_DATA_SUBSTITUTE
 
     return messages_copy
 
diff --git a/tests/integrations/pydantic_ai/test_pydantic_ai.py b/tests/integrations/pydantic_ai/test_pydantic_ai.py
@@ -55,6 +55,20 @@ def inner():
     return inner
 
 
+@pytest.fixture
+def sync_event_loop():
+    # Pydantic AI creates an event loop if there is none and doesn't close it in synchronous methods.
+    # Run with "-X tracemalloc=25 -W default::ResourceWarning" to reproduce.
+    # https://github.com/pydantic/pydantic-ai/commit/a58dd47f9cd6494665e47bf7cf71fccbfce2c0dd
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+    try:
+        yield loop
+    finally:
+        loop.close()
+        asyncio.set_event_loop(None)
+
+
 @pytest.mark.parametrize("span_streaming", [True, False])
 @pytest.mark.parametrize("stream_gen_ai_spans", [True, False])
 @pytest.mark.asyncio
@@ -284,6 +298,7 @@ def test_agent_run_sync(
     get_test_agent,
     stream_gen_ai_spans,
     span_streaming,
+    sync_event_loop,
 ):
     """
     Test that the integration creates spans for sync agent runs.
@@ -381,6 +396,7 @@ def test_agent_run_sync_model_error(
     capture_items,
     stream_gen_ai_spans,
     span_streaming,
+    sync_event_loop,
 ):
     sentry_init(
         integrations=[PydanticAIIntegration()],
@@ -1985,7 +2001,7 @@ async def test_context_cleanup_after_run(sentry_init, get_test_agent):
     assert "pydantic_ai_agent" not in scope._contexts
 
 
-def test_context_cleanup_after_run_sync(sentry_init, get_test_agent):
+def test_context_cleanup_after_run_sync(sentry_init, get_test_agent, sync_event_loop):
     """
     Test that the pydantic_ai_agent context is properly cleaned up after sync agent execution.
     """
diff --git a/tests/integrations/sanic/test_sanic.py b/tests/integrations/sanic/test_sanic.py
@@ -15,6 +15,7 @@
 from sentry_sdk import capture_message
 from sentry_sdk.integrations.sanic import SanicIntegration
 from sentry_sdk.tracing import TransactionSource
+from tests.conftest import get_free_port
 
 try:
     from sanic_testing import TestManager
@@ -85,7 +86,7 @@ def simple_client(app):
         yield app.test_client
 
     if ReusableClient is not None:
-        return ReusableClient(app)
+        return ReusableClient(app, port=get_free_port())
     else:
         return simple_client(app)
 
diff --git a/tests/test_ai_monitoring.py b/tests/test_ai_monitoring.py
@@ -923,6 +923,23 @@ def test_handles_non_dict_content_items(self):
         # Should return same list since no blobs
         assert result is messages
 
+    def test_redact_blob_message_parts_image_url_string_shorthand(self):
+        """image_url as a plain string (OpenAI shorthand) must not raise AttributeError"""
+        messages = [
+            {
+                "role": "user",
+                "content": [
+                    {"type": "text", "text": "What is in this image?"},
+                    {
+                        "type": "image_url",
+                        "image_url": "data:image/jpeg;base64,/9j/abc123==",
+                    },
+                ],
+            }
+        ]
+        result = redact_blob_message_parts(messages)
+        assert result[0]["content"][1]["image_url"] == "[Blob substitute]"
+
 
 class TestParseDataUri:
     def test_parses_base64_image_data_uri(self):
