cleaning up

Author: alexander-alderman-webb

tests/integrations/mcp/test_mcp.py

@@ -81,10 +81,7 @@ def get_mcp_command_payload(method: str, params, request_id: str):
     )
 
 
-async def stdio(server, method: str, params, request_id: str | None = None):
-    if request_id is None:
-        request_id = "1"  # arbitrary
-
+async def stdio(server, method: str, params, request_id: str):
     read_stream_writer, read_stream = anyio.create_memory_object_stream(0)
     write_stream, write_stream_reader = anyio.create_memory_object_stream(0)
 
@@ -355,7 +352,7 @@ async def test_tool_handler_with_error(sentry_init, capture_events):
     server = Server("test-server")
 
     @server.call_tool()
-    async def failing_tool(tool_name, arguments):
+    def failing_tool(tool_name, arguments):
         raise ValueError("Tool execution failed")
 
     with start_transaction(name="mcp tx"):
@@ -366,6 +363,7 @@ async def failing_tool(tool_name, arguments):
                 "name": "bad_tool",
                 "arguments": {},
             },
+            request_id="req-error",
         )
 
         assert (
@@ -547,7 +545,7 @@ async def failing_prompt(name, arguments):
                 "name": "code_help",
                 "arguments": {"language": "python"},
             },
-            request_id="req-prompt",
+            request_id="req-error-prompt",
         )
 
     assert response.message.root.error.message == "Prompt not found"
@@ -664,7 +662,7 @@ async def test_resource_handler_with_error(sentry_init, capture_events):
     server = Server("test-server")
 
     @server.read_resource()
-    async def failing_resource(uri):
+    def failing_resource(uri):
         raise FileNotFoundError("Resource not found")
 
     with start_transaction(name="mcp tx"):
@@ -674,6 +672,7 @@ async def failing_resource(uri):
             params={
                 "uri": "file:///missing.txt",
             },
+            request_id="req-error-resource",
         )
 
     # Should have error event and transaction
@@ -703,7 +702,7 @@ async def test_tool_result_extraction_tuple(
     server = Server("test-server")
 
     @server.call_tool()
-    async def test_tool_tuple(tool_name, arguments):
+    def test_tool_tuple(tool_name, arguments):
         # Return CombinationContent: (UnstructuredContent, StructuredContent)
         unstructured = [MockTextContent("Result text")]
         structured = {"key": "value", "count": 5}
@@ -715,8 +714,9 @@ async def test_tool_tuple(tool_name, arguments):
             method="tools/call",
             params={
                 "name": "calculate",
-                "arguments": {"x": 10, "y": 5},
+                "arguments": {},
             },
+            request_id="req-tuple",
         )
 
     (tx,) = events
@@ -755,7 +755,7 @@ async def test_tool_result_extraction_unstructured(
     server = Server("test-server")
 
     @server.call_tool()
-    async def test_tool_unstructured(tool_name, arguments):
+    def test_tool_unstructured(tool_name, arguments):
         # Return UnstructuredContent as list of content blocks
         return [
             MockTextContent("First part"),
@@ -767,9 +767,10 @@ async def test_tool_unstructured(tool_name, arguments):
             server,
             method="tools/call",
             params={
-                "name": "calculate",
-                "arguments": {"x": 10, "y": 5},
+                "name": "text_tool",
+                "arguments": {},
             },
+            request_id="req-unstructured",
         )
 
     (tx,) = events
@@ -784,43 +785,6 @@ async def test_tool_unstructured(tool_name, arguments):
         assert SPANDATA.MCP_TOOL_RESULT_CONTENT not in span["data"]
 
 
-def test_request_context_no_context(sentry_init, capture_events):
-    """Test handling when no request context is available"""
-    sentry_init(
-        integrations=[MCPIntegration()],
-        traces_sample_rate=1.0,
-    )
-    events = capture_events()
-
-    server = Server("test-server")
-
-    # Clear request context (simulating no context available)
-    # This will cause a LookupError when trying to get context
-    request_ctx.set(None)
-
-    @server.call_tool()
-    def test_tool_no_ctx(tool_name, arguments):
-        return {"result": "ok"}
-
-    with start_transaction(name="mcp tx"):
-        # This should work even without request context
-        try:
-            test_tool_no_ctx("tool", {})
-        except LookupError:
-            # If it raises LookupError, that's expected when context is truly missing
-            pass
-
-    # Should still create span even if context is missing
-    (tx,) = events
-    span = tx["spans"][0]
-
-    # Transport defaults to "pipe" when no context
-    assert span["data"][SPANDATA.MCP_TRANSPORT] == "stdio"
-    # Request ID and Session ID should not be present
-    assert SPANDATA.MCP_REQUEST_ID not in span["data"]
-    assert SPANDATA.MCP_SESSION_ID not in span["data"]
-
-
 @pytest.mark.asyncio
 async def test_span_origin(sentry_init, capture_events):
     """Test that span origin is set correctly"""
@@ -833,7 +797,7 @@ async def test_span_origin(sentry_init, capture_events):
     server = Server("test-server")
 
     @server.call_tool()
-    async def test_tool(tool_name, arguments):
+    def test_tool(tool_name, arguments):
         return {"result": "test"}
 
     with start_transaction(name="mcp tx"):
@@ -844,6 +808,7 @@ async def test_tool(tool_name, arguments):
                 "name": "calculate",
                 "arguments": {"x": 10, "y": 5},
             },
+            request_id="req-origin",
         )
 
     (tx,) = events
@@ -864,15 +829,15 @@ async def test_multiple_handlers(sentry_init, capture_events):
     server = Server("test-server")
 
     @server.call_tool()
-    async def tool1(tool_name, arguments):
+    def tool1(tool_name, arguments):
         return {"result": "tool1"}
 
     @server.call_tool()
-    async def tool2(tool_name, arguments):
+    def tool2(tool_name, arguments):
         return {"result": "tool2"}
 
     @server.get_prompt()
-    async def prompt1(name, arguments):
+    def prompt1(name, arguments):
         return GetPromptResult(
             description="A test prompt",
             messages=[
@@ -890,6 +855,7 @@ async def prompt1(name, arguments):
                 "name": "tool_a",
                 "arguments": {},
             },
+            request_id="req-multi",
         )
 
         await stdio(
@@ -899,6 +865,7 @@ async def prompt1(name, arguments):
                 "name": "tool_b",
                 "arguments": {},
             },
+            request_id="req-multi",
         )
 
         await stdio(
@@ -908,6 +875,7 @@ async def prompt1(name, arguments):
                 "name": "prompt_a",
                 "arguments": {},
             },
+            request_id="req-multi",
         )
 
     (tx,) = events
@@ -959,6 +927,7 @@ def test_prompt_dict(name, arguments):
                 "name": "dict_prompt",
                 "arguments": {},
             },
+            request_id="req-dict-prompt",
         )
 
     (tx,) = events
@@ -1002,6 +971,7 @@ def test_resource(uri):
             params={
                 "uri": "https://example.com/resource",
             },
+            request_id="req-no-proto",
         )
 
     (tx,) = events
@@ -1024,7 +994,7 @@ async def test_tool_with_complex_arguments(sentry_init, capture_events):
     server = Server("test-server")
 
     @server.call_tool()
-    async def test_tool_complex(tool_name, arguments):
+    def test_tool_complex(tool_name, arguments):
         return {"processed": True}
 
     with start_transaction(name="mcp tx"):
@@ -1040,6 +1010,7 @@ async def test_tool_complex(tool_name, arguments):
                 "name": "complex_tool",
                 "arguments": complex_args,
             },
+            request_id="req-complex",
         )
 
     (tx,) = events
@@ -1181,6 +1152,7 @@ async def test_tool(tool_name, arguments):
                 "name": "stdio_tool",
                 "arguments": {},
             },
+            request_id="req-stdio",
         )
 
     assert result.message.root.result["structuredContent"] == {"result": "success"}