Skip to content

fix(mcp): Handle None arguments in tool and prompt handlers #7387

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

Merged
alexander-alderman-webb merged 4 commits into from
Sep 7, 2026
+2 −2
Merged

fix(mcp): Handle None arguments in tool and prompt handlers #7387

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
203b64c
ref(mcp): Inline _extract_handler_data_from_args
alexander-alderman-webb Sep 4, 2026
885ac3b
add type annotation
alexander-alderman-webb Sep 4, 2026
193785c
fix(mcp): Handle None arguments in tool and prompt handlers
alexander-alderman-webb Sep 4, 2026
feea878
merge master
alexander-alderman-webb Sep 7, 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
4 changes: 2 additions & 2 deletions sentry_sdk/integrations/mcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
handler_name = original_kwargs["name"]

arguments = {}
if len(original_args) > 1:
if len(original_args) > 1 and original_args[1] is not None:
arguments = original_args[1]
elif original_kwargs.get("arguments"):
arguments = original_kwargs["arguments"]
Expand Down Expand Up @@ -514,10 +514,10 @@
handler_name = original_kwargs["name"]

arguments = {}
if len(original_args) > 1:
if len(original_args) > 1 and original_args[1] is not None:
arguments = original_args[1]
elif original_kwargs.get("arguments"):
arguments = original_kwargs["arguments"]

Check warning on line 520 in sentry_sdk/integrations/mcp.py

View check run for this annotation

@sentry/warden / warden: code-review

No test covers None prompt arguments path 

Add a regression test that invokes the prompt handler with `arguments=None` (positional and/or omitted) so this null-guard cannot regress.
Comment thread
alexander-alderman-webb marked this conversation as resolved.

if has_data_collection_enabled(client.options):
if not client.options["data_collection"]["gen_ai"]["inputs"]:
Expand Down
Loading