fix(pydantic-ai): Adapt to missing ToolManager._call_tool (#5522)

### Description
The internal function `ToolManager._call_tool` was removed. Patch
`ToolManager.execute_tool_call` instead.

Also:
- pull in a test matrix update so that we actually run the test suite
for the version of Pydantic AI where the change was introduced
- make two pydantic ai tests compatible with one older pydantic ai
version that used to complain about specific message history orders

#### Issues
Fixes #5518

#### Reminders
- Please add tests to validate your changes, and lint your code using
`tox -e linters`.
- Add GH Issue ID _&_ Linear ID (if applicable)
- PR title should use [conventional
commit](https://develop.sentry.dev/engineering-practices/commit-messages/#type)
style (`feat:`, `fix:`, `ref:`, `meta:`)
- For external contributors:
[CONTRIBUTING.md](https://github.com/getsentry/sentry-python/blob/master/CONTRIBUTING.md),
[Sentry SDK development docs](https://develop.sentry.dev/sdk/), [Discord
community](https://discord.gg/Ww9hbqr)

Author: sentrivana

scripts/populate_tox/package_dependencies.jsonl

@@ -28,6 +28,85 @@
 
 
 def _patch_tool_execution() -> None:
+    if hasattr(ToolManager, "execute_tool_call"):
+        _patch_execute_tool_call()
+
+    elif hasattr(ToolManager, "_call_tool"):
+        # older versions
+        _patch_call_tool()
+
+
+def _patch_execute_tool_call() -> None:
+    original_execute_tool_call = ToolManager.execute_tool_call
+
+    @wraps(original_execute_tool_call)
+    async def wrapped_execute_tool_call(
+        self: "Any", validated: "Any", *args: "Any", **kwargs: "Any"
+    ) -> "Any":
+        if not validated or not hasattr(validated, "call"):
+            return await original_execute_tool_call(self, validated, *args, **kwargs)
+
+        # Extract tool info before calling original
+        call = validated.call
+        name = call.tool_name
+        tool = self.tools.get(name) if self.tools else None
+
+        # Determine tool type by checking tool.toolset
+        tool_type = "function"
+        if tool and HAS_MCP and isinstance(tool.toolset, MCPServer):
+            tool_type = "mcp"
+
+        # Get agent from contextvar
+        agent = get_current_agent()
+
+        if agent and tool:
+            try:
+                args_dict = call.args_as_dict()
+            except Exception:
+                args_dict = call.args if isinstance(call.args, dict) else {}
+
+            # Create execute_tool span
+            # Nesting is handled by isolation_scope() to ensure proper parent-child relationships
+            with sentry_sdk.isolation_scope():
+                with execute_tool_span(
+                    name,
+                    args_dict,
+                    agent,
+                    tool_type=tool_type,
+                ) as span:
+                    try:
+                        result = await original_execute_tool_call(
+                            self,
+                            validated,
+                            *args,
+                            **kwargs,
+                        )
+                        update_execute_tool_span(span, result)
+                        return result
+                    except ToolRetryError as exc:
+                        exc_info = sys.exc_info()
+                        with capture_internal_exceptions():
+                            # Avoid circular import due to multi-file integration structure
+                            from sentry_sdk.integrations.pydantic_ai import (
+                                PydanticAIIntegration,
+                            )
+
+                            integration = sentry_sdk.get_client().get_integration(
+                                PydanticAIIntegration
+                            )
+                            if (
+                                integration is not None
+                                and integration.handled_tool_call_exceptions
+                            ):
+                                _capture_exception(exc, handled=True)
+                        reraise(*exc_info)
+
+        return await original_execute_tool_call(self, validated, *args, **kwargs)
+
+    ToolManager.execute_tool_call = wrapped_execute_tool_call
+
+
+def _patch_call_tool() -> None:
     """
     Patch ToolManager._call_tool to create execute_tool spans.
 
@@ -39,7 +118,6 @@ def _patch_tool_execution() -> None:
     - Dealing with signature mismatches from instrumented MCP servers
     - Complex nested toolset handling
     """
-
     original_call_tool = ToolManager._call_tool
 
     @wraps(original_call_tool)

scripts/populate_tox/releases.jsonl

@@ -711,7 +711,9 @@ async def test_message_history(sentry_init, capture_events):
     from pydantic_ai import messages
 
     history = [
-        messages.UserPromptPart(content="Hello, I'm Alice"),
+        messages.ModelRequest(
+            parts=[messages.UserPromptPart(content="Hello, I'm Alice")]
+        ),
         messages.ModelResponse(
             parts=[messages.TextPart(content="Hello Alice! How can I help you?")],
             model_name="test",
@@ -1493,7 +1495,7 @@ async def test_message_formatting_with_different_parts(sentry_init, capture_even
 
     # Create message history with different part types
     history = [
-        messages.UserPromptPart(content="Hello"),
+        messages.ModelRequest(parts=[messages.UserPromptPart(content="Hello")]),
         messages.ModelResponse(
             parts=[
                 messages.TextPart(content="Hi there!"),

sentry_sdk/integrations/pydantic_ai/patches/tools.py

@@ -72,12 +72,12 @@ envlist =
     {py3.10,py3.11,py3.12}-openai_agents-v0.0.19
     {py3.10,py3.12,py3.13}-openai_agents-v0.3.3
     {py3.10,py3.13,py3.14,py3.14t}-openai_agents-v0.6.9
-    {py3.10,py3.13,py3.14,py3.14t}-openai_agents-v0.9.3
+    {py3.10,py3.13,py3.14,py3.14t}-openai_agents-v0.10.1
 
     {py3.10,py3.12,py3.13}-pydantic_ai-v1.0.18
-    {py3.10,py3.12,py3.13}-pydantic_ai-v1.20.0
-    {py3.10,py3.12,py3.13}-pydantic_ai-v1.40.0
-    {py3.10,py3.13,py3.14}-pydantic_ai-v1.62.0
+    {py3.10,py3.12,py3.13}-pydantic_ai-v1.21.0
+    {py3.10,py3.12,py3.13}-pydantic_ai-v1.42.0
+    {py3.10,py3.13,py3.14}-pydantic_ai-v1.63.0
 
 
     # ~~~ AI Workflow ~~~
@@ -116,22 +116,22 @@ envlist =
     {py3.9,py3.12,py3.13}-litellm-v1.77.7
     {py3.9,py3.12,py3.13}-litellm-v1.78.7
     {py3.9,py3.12,py3.13}-litellm-v1.79.3
-    {py3.9,py3.12,py3.13}-litellm-v1.81.14
+    {py3.9,py3.12,py3.13}-litellm-v1.81.15
 
     {py3.8,py3.11,py3.12}-openai-base-v1.0.1
     {py3.8,py3.12,py3.13}-openai-base-v1.109.1
-    {py3.9,py3.13,py3.14,py3.14t}-openai-base-v2.21.0
+    {py3.9,py3.13,py3.14,py3.14t}-openai-base-v2.23.0
 
     {py3.8,py3.11,py3.12}-openai-notiktoken-v1.0.1
     {py3.8,py3.12,py3.13}-openai-notiktoken-v1.109.1
-    {py3.9,py3.13,py3.14,py3.14t}-openai-notiktoken-v2.21.0
+    {py3.9,py3.13,py3.14,py3.14t}-openai-notiktoken-v2.23.0
 
 
     # ~~~ Cloud ~~~
     {py3.6,py3.7}-boto3-v1.12.49
     {py3.6,py3.9,py3.10}-boto3-v1.21.46
     {py3.7,py3.11,py3.12}-boto3-v1.33.13
-    {py3.9,py3.13,py3.14,py3.14t}-boto3-v1.42.54
+    {py3.9,py3.13,py3.14,py3.14t}-boto3-v1.42.55
 
     {py3.6,py3.7,py3.8}-chalice-v1.16.0
     {py3.9,py3.12,py3.13}-chalice-v1.32.0
@@ -191,7 +191,7 @@ envlist =
     {py3.8,py3.12,py3.13}-graphene-v3.4.3
 
     {py3.8,py3.10,py3.11}-strawberry-v0.209.8
-    {py3.10,py3.13,py3.14,py3.14t}-strawberry-v0.305.0
+    {py3.10,py3.13,py3.14,py3.14t}-strawberry-v0.306.0
 
 
     # ~~~ Network ~~~
@@ -256,9 +256,9 @@ envlist =
     {py3.10,py3.13,py3.14,py3.14t}-starlette-v0.52.1
 
     {py3.6,py3.9,py3.10}-fastapi-v0.79.1
-    {py3.7,py3.10,py3.11}-fastapi-v0.96.1
-    {py3.8,py3.11,py3.12}-fastapi-v0.113.0
-    {py3.10,py3.13,py3.14,py3.14t}-fastapi-v0.131.0
+    {py3.7,py3.10,py3.11}-fastapi-v0.97.0
+    {py3.8,py3.12,py3.13}-fastapi-v0.115.14
+    {py3.10,py3.13,py3.14,py3.14t}-fastapi-v0.133.0
 
 
     # ~~~ Web 2 ~~~
@@ -398,13 +398,13 @@ deps =
     openai_agents-v0.0.19: openai-agents==0.0.19
     openai_agents-v0.3.3: openai-agents==0.3.3
     openai_agents-v0.6.9: openai-agents==0.6.9
-    openai_agents-v0.9.3: openai-agents==0.9.3
+    openai_agents-v0.10.1: openai-agents==0.10.1
     openai_agents: pytest-asyncio
 
     pydantic_ai-v1.0.18: pydantic-ai==1.0.18
-    pydantic_ai-v1.20.0: pydantic-ai==1.20.0
-    pydantic_ai-v1.40.0: pydantic-ai==1.40.0
-    pydantic_ai-v1.62.0: pydantic-ai==1.62.0
+    pydantic_ai-v1.21.0: pydantic-ai==1.21.0
+    pydantic_ai-v1.42.0: pydantic-ai==1.42.0
+    pydantic_ai-v1.63.0: pydantic-ai==1.63.0
     pydantic_ai: pytest-asyncio
 
 
@@ -463,18 +463,18 @@ deps =
     litellm-v1.77.7: litellm==1.77.7
     litellm-v1.78.7: litellm==1.78.7
     litellm-v1.79.3: litellm==1.79.3
-    litellm-v1.81.14: litellm==1.81.14
+    litellm-v1.81.15: litellm==1.81.15
 
     openai-base-v1.0.1: openai==1.0.1
     openai-base-v1.109.1: openai==1.109.1
-    openai-base-v2.21.0: openai==2.21.0
+    openai-base-v2.23.0: openai==2.23.0
     openai-base: pytest-asyncio
     openai-base: tiktoken
     openai-base-v1.0.1: httpx<0.28
 
     openai-notiktoken-v1.0.1: openai==1.0.1
     openai-notiktoken-v1.109.1: openai==1.109.1
-    openai-notiktoken-v2.21.0: openai==2.21.0
+    openai-notiktoken-v2.23.0: openai==2.23.0
     openai-notiktoken: pytest-asyncio
     openai-notiktoken-v1.0.1: httpx<0.28
 
@@ -483,7 +483,7 @@ deps =
     boto3-v1.12.49: boto3==1.12.49
     boto3-v1.21.46: boto3==1.21.46
     boto3-v1.33.13: boto3==1.33.13
-    boto3-v1.42.54: boto3==1.42.54
+    boto3-v1.42.55: boto3==1.42.55
     {py3.7,py3.8}-boto3: urllib3<2.0.0
 
     chalice-v1.16.0: chalice==1.16.0
@@ -562,7 +562,7 @@ deps =
     {py3.6}-graphene: aiocontextvars
 
     strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
-    strawberry-v0.305.0: strawberry-graphql[fastapi,flask]==0.305.0
+    strawberry-v0.306.0: strawberry-graphql[fastapi,flask]==0.306.0
     strawberry: httpx
     strawberry-v0.209.8: pydantic<2.11
 
@@ -687,16 +687,16 @@ deps =
     {py3.6}-starlette: aiocontextvars
 
     fastapi-v0.79.1: fastapi==0.79.1
-    fastapi-v0.96.1: fastapi==0.96.1
-    fastapi-v0.113.0: fastapi==0.113.0
-    fastapi-v0.131.0: fastapi==0.131.0
+    fastapi-v0.97.0: fastapi==0.97.0
+    fastapi-v0.115.14: fastapi==0.115.14
+    fastapi-v0.133.0: fastapi==0.133.0
     fastapi: httpx
     fastapi: pytest-asyncio
     fastapi: python-multipart
     fastapi: requests
     fastapi: anyio<4
     fastapi-v0.79.1: httpx<0.28.0
-    fastapi-v0.96.1: httpx<0.28.0
+    fastapi-v0.97.0: httpx<0.28.0
     {py3.6}-fastapi: aiocontextvars