|
3 | 3 | import mcp_types as types |
4 | 4 | import pytest |
5 | 5 | from logfire.testing import CaptureLogfire |
6 | | -from opentelemetry.trace import StatusCode |
| 6 | +from opentelemetry.trace import SpanKind, StatusCode |
7 | 7 |
|
8 | 8 | from mcp.client.client import Client |
9 | 9 | from mcp.server import Server, ServerRequestContext |
10 | 10 | from mcp.server.mcpserver import MCPServer |
| 11 | +from mcp.server.mcpserver.exceptions import ToolError |
11 | 12 | from mcp.shared._otel import extract_trace_context |
12 | 13 | from mcp.shared.exceptions import MCPError |
13 | 14 |
|
@@ -91,3 +92,52 @@ async def list_prompts( |
91 | 92 | assert failed.attributes is not None |
92 | 93 | assert failed.attributes["error.type"] == str(types.INVALID_PARAMS) |
93 | 94 | assert failed.attributes["rpc.response.status_code"] == str(types.INVALID_PARAMS) |
| 95 | + |
| 96 | + |
| 97 | +async def test_client_and_server_spans_agree_on_tool_error(capfire: CaptureLogfire) -> None: |
| 98 | + """A `tools/call` whose result has `isError: true` marks both client and server spans ERROR with |
| 99 | + `error.type="tool_error"` and no `rpc.response.status_code` (OpenTelemetry GenAI MCP conventions); |
| 100 | + a succeeding `tools/call` leaves both spans UNSET. |
| 101 | + """ |
| 102 | + server = MCPServer("test") |
| 103 | + |
| 104 | + @server.tool() |
| 105 | + def ok() -> str: |
| 106 | + return "fine" |
| 107 | + |
| 108 | + @server.tool() |
| 109 | + def fail() -> str: |
| 110 | + raise ToolError("upstream unavailable") |
| 111 | + |
| 112 | + async with Client(server, mode="legacy") as client: |
| 113 | + ok_result = await client.call_tool("ok") |
| 114 | + err_result = await client.call_tool("fail") |
| 115 | + |
| 116 | + assert ok_result.is_error is False |
| 117 | + assert err_result.is_error is True |
| 118 | + assert isinstance(err_result.content[0], types.TextContent) |
| 119 | + assert err_result.content[0].text == "Error executing tool fail: upstream unavailable" |
| 120 | + |
| 121 | + spans = { |
| 122 | + (span.name, span.kind): span |
| 123 | + for span in capfire.exporter.exported_spans |
| 124 | + if (span.attributes or {}).get("logfire.span_type") != "pending_span" |
| 125 | + } |
| 126 | + |
| 127 | + client_ok = spans[("MCP send tools/call ok", SpanKind.CLIENT)] |
| 128 | + server_ok = spans[("tools/call ok", SpanKind.SERVER)] |
| 129 | + assert client_ok.status.status_code == StatusCode.UNSET |
| 130 | + assert server_ok.status.status_code == StatusCode.UNSET |
| 131 | + assert client_ok.attributes is not None |
| 132 | + assert "error.type" not in client_ok.attributes |
| 133 | + |
| 134 | + client_fail = spans[("MCP send tools/call fail", SpanKind.CLIENT)] |
| 135 | + server_fail = spans[("tools/call fail", SpanKind.SERVER)] |
| 136 | + assert client_fail.context is not None and server_fail.context is not None |
| 137 | + assert client_fail.context.trace_id == server_fail.context.trace_id |
| 138 | + assert client_fail.status.status_code == StatusCode.ERROR |
| 139 | + assert server_fail.status.status_code == StatusCode.ERROR |
| 140 | + assert client_fail.attributes is not None and server_fail.attributes is not None |
| 141 | + assert client_fail.attributes["error.type"] == "tool_error" |
| 142 | + assert server_fail.attributes["error.type"] == "tool_error" |
| 143 | + assert "rpc.response.status_code" not in client_fail.attributes |
0 commit comments