chore(mcp): Replace deprecated mcp.tool.name with gen_ai.tool.name

Author: alexander-alderman-webb

sentry_sdk/consts.py

@@ -1087,6 +1087,9 @@ class SPANDATA:
 
     MCP_TOOL_NAME = "mcp.tool.name"
     """
+    .. deprecated::
+        This attribute is deprecated. Use GEN_AI_TOOL_NAME instead.
+
     The name of the MCP tool being called.
     Example: "get_weather"
     """

sentry_sdk/integrations/mcp.py

@@ -261,7 +261,7 @@ async def _instrument_tool_call(
         _set_span_input_data(
             span,
             handler_name,
-            SPANDATA.MCP_TOOL_NAME,
+            SPANDATA.GEN_AI_TOOL_NAME,
             "tools/call",
             arguments,
             request_id,

tests/integrations/fastmcp/test_fastmcp.py

@@ -312,7 +312,7 @@ def add_numbers(a: int, b: int) -> dict:
     assert span["attributes"]["sentry.op"] == OP.MCP_SERVER
     assert span["attributes"]["sentry.origin"] == "auto.ai.mcp"
     assert span["name"] == "tools/call add_numbers"
-    assert span["attributes"][SPANDATA.MCP_TOOL_NAME] == "add_numbers"
+    assert span["attributes"][SPANDATA.GEN_AI_TOOL_NAME] == "add_numbers"
     assert span["attributes"][SPANDATA.MCP_METHOD_NAME] == "tools/call"
     assert span["attributes"][SPANDATA.MCP_TRANSPORT] == "stdio"
     assert span["attributes"][SPANDATA.MCP_REQUEST_ID] == "req-123"
@@ -369,7 +369,7 @@ def add_numbers(a: int, b: int) -> dict:
     assert span["attributes"]["sentry.op"] == OP.MCP_SERVER
     assert span["attributes"]["sentry.origin"] == "auto.ai.mcp"
     assert span["name"] == "tools/call add_numbers"
-    assert span["attributes"][SPANDATA.MCP_TOOL_NAME] == "add_numbers"
+    assert span["attributes"][SPANDATA.GEN_AI_TOOL_NAME] == "add_numbers"
     assert span["attributes"][SPANDATA.MCP_METHOD_NAME] == "tools/call"
     assert span["attributes"][SPANDATA.MCP_TRANSPORT] == "stdio"
     assert span["attributes"][SPANDATA.MCP_REQUEST_ID] == "req-123"

tests/integrations/mcp/test_mcp.py

@@ -169,7 +169,7 @@ async def test_tool(ctx, params):
     assert span is not None
     data = span["attributes"]
 
-    assert data[SPANDATA.MCP_TOOL_NAME] == "calculate"
+    assert data[SPANDATA.GEN_AI_TOOL_NAME] == "calculate"
     assert data[SPANDATA.MCP_METHOD_NAME] == "tools/call"
     assert data[SPANDATA.MCP_REQUEST_ID] == "req-ctor"
 
@@ -305,7 +305,7 @@ async def test_tool(ctx, params):
     assert data["sentry.origin"] == "auto.ai.mcp"
 
     # Check span data
-    assert data[SPANDATA.MCP_TOOL_NAME] == "calculate"
+    assert data[SPANDATA.GEN_AI_TOOL_NAME] == "calculate"
     assert data[SPANDATA.MCP_METHOD_NAME] == "tools/call"
     assert data[SPANDATA.MCP_TRANSPORT] == "stdio"
     assert data[SPANDATA.NETWORK_TRANSPORT] == "pipe"
@@ -381,7 +381,7 @@ async def test_tool(ctx, params):
     assert data["sentry.origin"] == "auto.ai.mcp"
 
     # Check span data
-    assert data[SPANDATA.MCP_TOOL_NAME] == "calculate"
+    assert data[SPANDATA.GEN_AI_TOOL_NAME] == "calculate"
     assert data[SPANDATA.MCP_METHOD_NAME] == "tools/call"
     assert data[SPANDATA.MCP_TRANSPORT] == "stdio"
     assert data[SPANDATA.NETWORK_TRANSPORT] == "pipe"
@@ -456,7 +456,7 @@ async def test_tool_async(ctx, params):
     assert data["sentry.origin"] == "auto.ai.mcp"
 
     # Check span data
-    assert data[SPANDATA.MCP_TOOL_NAME] == "process"
+    assert data[SPANDATA.GEN_AI_TOOL_NAME] == "process"
     assert data[SPANDATA.MCP_METHOD_NAME] == "tools/call"
     assert data[SPANDATA.MCP_TRANSPORT] == "http"
     assert data[SPANDATA.NETWORK_TRANSPORT] == "tcp"
@@ -533,7 +533,7 @@ async def test_tool_async(ctx, params):
     assert data["sentry.origin"] == "auto.ai.mcp"
 
     # Check span data
-    assert data[SPANDATA.MCP_TOOL_NAME] == "process"
+    assert data[SPANDATA.GEN_AI_TOOL_NAME] == "process"
     assert data[SPANDATA.MCP_METHOD_NAME] == "tools/call"
     assert data[SPANDATA.MCP_TRANSPORT] == "http"
     assert data[SPANDATA.NETWORK_TRANSPORT] == "tcp"