FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix: record JSON-RPC errors on client OpenTelemetry spans by mikemikimike · Pull Request #3401 · modelcontextprotocol/python-sdk · GitHub

/ python-sdk Public

fix: record JSON-RPC errors on client OpenTelemetry spans #3401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mikemikimike wants to merge 1 commit into from
+27 −2
Conversation 1 Commits 1 Checks 30 Files changed 2
Closed

fix: record JSON-RPC errors on client OpenTelemetry spans #3401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
8 changes: 6 additions & 2 deletions src/mcp/shared/jsonrpc_dispatcher.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
ProgressToken,
RequestId,
)
from opentelemetry.trace import SpanKind
from opentelemetry.trace import SpanKind, StatusCode
from pydantic import ValidationError
from typing_extensions import TypeVar

Expand Down Expand Up @@ -385,7 +385,7 @@ async def send_raw_request(
span_name,
kind=SpanKind.CLIENT,
attributes={"mcp.method.name": method, "jsonrpc.request.id": str(request_id)},
):
) as span:
# SEP-414: inject W3C trace context; `_meta` stays on the wire even with a no-op tracer.
inject_trace_context(out_meta)
msg = JSONRPCRequest(jsonrpc="2.0", id=request_id, method=method, params=out_params)
Expand All @@ -401,6 +401,10 @@ async def send_raw_request(
with anyio.fail_after(opts.get("timeout")):
timeout_armed = True
outcome = await receive.receive()
if isinstance(outcome, ErrorData):
span.set_status(StatusCode.ERROR)
span.set_attribute("error.type", "mcp_error")
span.set_attribute("rpc.response.status_code", outcome.code)
except TimeoutError:
if not timeout_armed:
# `fail_after` arms only after the write, so this TimeoutError is the
Expand Down
21 changes: 21 additions & 0 deletions tests/server/test_otel.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
from mcp_types import (
INTERNAL_ERROR,
INVALID_PARAMS,
METHOD_NOT_FOUND,
CallToolRequestParams,
CallToolResult,
ErrorData,
GetPromptRequestParams,
GetPromptResult,
ListToolsResult,
Expand Down Expand Up @@ -70,6 +72,25 @@ async def test_emits_server_span_with_method_and_target(server: SrvT, spans: Spa
assert span.status.status_code == StatusCode.UNSET


@pytest.mark.anyio
async def test_client_span_records_jsonrpc_error_response(server: SrvT, spans: SpanCapture):
async def missing_method(ctx: Ctx, params: PaginatedRequestParams | None) -> ErrorData:
return ErrorData(code=METHOD_NOT_FOUND, message="missing")

server.add_request_handler("missing", PaginatedRequestParams, missing_method)
async with connected_runner(server) as (client, _):
spans.clear()
with pytest.raises(MCPError) as exc:
await client.send_raw_request("missing", {})

assert exc.value.error.code == METHOD_NOT_FOUND
[span] = [s for s in spans.finished() if s.kind == SpanKind.CLIENT]
assert span.status.status_code == StatusCode.ERROR
assert span.attributes is not None
assert span.attributes["error.type"] == "mcp_error"
assert span.attributes["rpc.response.status_code"] == METHOD_NOT_FOUND


@pytest.mark.anyio
async def test_tool_error_dict_result_sets_error_type(server: SrvT, spans: SpanCapture):
async def err_tool(ctx: Ctx, params: CallToolRequestParams) -> dict[str, Any]:
Expand Down
Loading
Back | FazBrowse Home | New Git URL