Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
34d0719
ref(mcp): Separate tool, prompt and resource patches
alexander-alderman-webb Jul 2, 2026
ad0599d
add types
alexander-alderman-webb Jul 2, 2026
1354ec9
types
alexander-alderman-webb Jul 2, 2026
568365c
types
alexander-alderman-webb Jul 2, 2026
6d0d364
update
alexander-alderman-webb Jul 2, 2026
41eece3
merge master
alexander-alderman-webb Jul 6, 2026
247f5d4
ref(mcp): Use middleware when available
alexander-alderman-webb Jul 6, 2026
ebf64d3
ref(mcp): Inline _prepare_handler_data
alexander-alderman-webb Jul 6, 2026
6ddc211
ref(mcp): Inline _get_span_config()
alexander-alderman-webb Jul 7, 2026
f59527a
ref(mcp): Inline _set_span_output_data()
alexander-alderman-webb Jul 7, 2026
15c7bdd
ref(mcp): Use mcp_types package
alexander-alderman-webb Jul 7, 2026
49b8f07
fix(mcp): Stop adding the prompt name to arguments
alexander-alderman-webb Jul 7, 2026
92d0572
simplify
alexander-alderman-webb Jul 7, 2026
93ea189
restore
alexander-alderman-webb Jul 7, 2026
678ec71
Merge branch 'webb/mcp/seperate-handlers' into webb/mcp/use-middleware
alexander-alderman-webb Jul 7, 2026
b38750f
merge
alexander-alderman-webb Jul 7, 2026
a5b8cbf
restore
alexander-alderman-webb Jul 7, 2026
e05fff8
forward kwargs
alexander-alderman-webb Jul 7, 2026
7b03ff3
Merge branch 'webb/mcp/seperate-handlers' into webb/mcp/use-middleware
alexander-alderman-webb Jul 7, 2026
93fa89b
Merge branch 'webb/mcp/use-middleware' into webb/mcp/use-middleware-2
alexander-alderman-webb Jul 7, 2026
508ee6d
Merge branch 'webb/mcp/use-middleware-2' into webb/mcp/use-middleware-3
alexander-alderman-webb Jul 7, 2026
b3cacc8
Merge branch 'webb/mcp/use-middleware-3' into webb/mcp/use-middleware-4
alexander-alderman-webb Jul 7, 2026
4668762
Merge branch 'webb/mcp/use-middleware-4' into webb/mcp/prompt-arguments
alexander-alderman-webb Jul 7, 2026
5b031db
restore uv.lock
alexander-alderman-webb Jul 7, 2026
0e5aac6
rename function
alexander-alderman-webb Jul 7, 2026
edee344
Merge branch 'webb/mcp/seperate-handlers' into webb/mcp/use-middleware
alexander-alderman-webb Jul 7, 2026
a3e10c3
Merge branch 'webb/mcp/use-middleware' into webb/mcp/use-middleware-2
alexander-alderman-webb Jul 7, 2026
7a271a7
Merge branch 'webb/mcp/use-middleware-2' into webb/mcp/use-middleware-3
alexander-alderman-webb Jul 7, 2026
3f6d93b
Merge branch 'webb/mcp/use-middleware-3' into webb/mcp/use-middleware-4
alexander-alderman-webb Jul 7, 2026
d11e459
Merge branch 'webb/mcp/use-middleware-4' into webb/mcp/prompt-arguments
alexander-alderman-webb Jul 7, 2026
8724665
Merge branch 'master' into webb/mcp/prompt-arguments
alexander-alderman-webb Jul 28, 2026
498f923
restore tox files
alexander-alderman-webb Jul 28, 2026
fa43935
remove in v1 handler as well
alexander-alderman-webb Jul 28, 2026
492dd4a
simplify
alexander-alderman-webb Jul 28, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions sentry_sdk/integrations/mcp.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ def _extract_handler_data_from_params(
elif handler_type == "prompt":
handler_name = getattr(params, "name", "unknown")
arguments = getattr(params, "arguments", None) or {}
Comment thread
alexander-alderman-webb marked this conversation as resolved.
arguments = {"name": handler_name, **arguments}
Comment thread
alexander-alderman-webb marked this conversation as resolved.
else: # resource
handler_name = str(getattr(params, "uri", "unknown"))
arguments = {}
Expand Down Expand Up @@ -333,8 +332,6 @@ def _extract_handler_data_from_args(
elif original_kwargs.get("arguments"):
arguments = original_kwargs["arguments"]

arguments = {"name": handler_name, **(arguments or {})}
Comment thread
alexander-alderman-webb marked this conversation as resolved.

else: # resource
handler_name = "unknown"
if original_args:
Expand Down
1 change: 0 additions & 1 deletion tests/integrations/mcp/test_mcp.py
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,6 @@ async def test_prompt(name, arguments):
assert data[SPANDATA.MCP_METHOD_NAME] == "prompts/get"
assert data[SPANDATA.MCP_TRANSPORT] == "stdio"
assert data[SPANDATA.MCP_REQUEST_ID] == "req-prompt"
assert data["mcp.request.argument.name"] == "code_help"
assert data["mcp.request.argument.language"] == "python"
Comment thread
alexander-alderman-webb marked this conversation as resolved.

# Message count is always captured
Expand Down
Loading