Replace ddtrace with telemetry

Author: jboolean

ddtrace/contrib/internal/mcp/patch.py

@@ -243,7 +243,7 @@ def traced_request_responder_enter(mcp, pin: Pin, func, instance, args: tuple, k
     setattr(instance, "_dd_span", span)
 
     if isinstance(request_root, CallToolRequest):
-        integration.process_ddtrace_argument(span, request_root)
+        integration.process_telemetry_argument(span, request_root)
 
     return func(*args, **kwargs)
 

ddtrace/llmobs/_integrations/mcp.py

@@ -38,7 +38,7 @@
 SERVER_TOOL_CALL_OPERATION_NAME = "server_tool_call"
 
 
-DD_TRACE_KEY = "ddtrace"
+TELEMETRY_KEY = "telemetry"
 INTENT_KEY = "intent"
 INTENT_PROMPT = """Briefly describe the wider context task, and why this tool was chosen.
  Omit argument values, PII/secrets. Use English.
@@ -108,7 +108,7 @@ def inject_tools_list_response(self, response: "ListToolsResult") -> None:
             if "required" not in input_schema:
                 input_schema["required"] = []
 
-            input_schema["properties"][DD_TRACE_KEY] = dd_trace_input_schema()
+            input_schema["properties"][TELEMETRY_KEY] = dd_trace_input_schema()
             input_schema["required"].append(INTENT_KEY)
 
     def _parse_mcp_text_content(self, item: Any) -> Dict[str, Any]:
@@ -245,23 +245,23 @@ def _set_call_tool_request_overrides(
         _set_or_update_tags(span, override_tags)
         span._set_ctx_items({NAME: tool_name, SPAN_KIND: "tool"})
 
-    def process_ddtrace_argument(self, span: Span, request: "CallToolRequest") -> None:
-        """Process and remove ddtrace argument from requests
+    def process_telemetry_argument(self, span: Span, request: "CallToolRequest") -> None:
+        """Process and remove telemetry argument from requests
         This is called before the tool is called or the input is recorded
         """
         if not self.llmobs_enabled:
             return
 
         params = _get_attr(request, "params", None)
         arguments = _get_attr(params, "arguments", None)
-        ddtrace = _get_attr(arguments, DD_TRACE_KEY, None)
-        if isinstance(arguments, dict) and ddtrace:
-            intent = _get_attr(ddtrace, INTENT_KEY, None)
+        telemetry = _get_attr(arguments, TELEMETRY_KEY, None)
+        if isinstance(arguments, dict) and telemetry:
+            intent = _get_attr(telemetry, INTENT_KEY, None)
             if intent:
                 span._set_ctx_item(MCP_TOOL_CALL_INTENT, intent)
 
             # The argument is removed before recording the input and calling the tool
-            del arguments[DD_TRACE_KEY]
+            del arguments[TELEMETRY_KEY]
 
     def _llmobs_set_tags_request_responder_respond(
         self, span: Span, args: List[Any], kwargs: Dict[str, Any], response: Any

releasenotes/notes/rename-mcp-intent-capture-argument-57a5b2b261052441.yaml

@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    When using the intent capture feature of the MCP integration, a tool argument is injected.
+    The name of the argument is renamed from ``ddtrace`` to ``telemetry``.

tests/contrib/mcp/test_mcp_llmobs.py

@@ -328,7 +328,7 @@ async def test():
 
 
 def test_intent_capture_tool_schema_injection(mcp_setup, mock_tracer, llmobs_events, mcp_server):
-    """Test that intent capture adds ddtrace property to tool input schemas."""
+    """Test that intent capture adds telemetry property to tool input schemas."""
     from mcp.shared.memory import create_connected_server_and_client_session
 
     async def run_test():
@@ -341,14 +341,14 @@ async def run_test():
     tool = next(t for t in result.tools if t.name == "calculator")
     schema = tool.inputSchema
 
-    # Verify ddtrace property is injected
-    assert "ddtrace" in schema["properties"], f"ddtrace not in properties: {schema}"
-    ddtrace_schema = schema["properties"]["ddtrace"]
-    assert ddtrace_schema["type"] == "object"
-    assert "intent" in ddtrace_schema["properties"]
-    assert ddtrace_schema["properties"]["intent"]["type"] == "string"
-    assert "required" in ddtrace_schema
-    assert "intent" in ddtrace_schema["required"]
+    # Verify telemetry property is injected
+    assert "telemetry" in schema["properties"], f"telemetry not in properties: {schema}"
+    telemetry_schema = schema["properties"]["telemetry"]
+    assert telemetry_schema["type"] == "object"
+    assert "intent" in telemetry_schema["properties"]
+    assert telemetry_schema["properties"]["intent"]["type"] == "string"
+    assert "required" in telemetry_schema
+    assert "intent" in telemetry_schema["required"]
 
     # Verify original tool arguments are unchanged
     assert "operation" in schema["properties"]
@@ -366,7 +366,7 @@ async def run_test():
 
 
 def test_intent_capture_records_intent_on_span_meta(mcp_setup, mock_tracer, llmobs_events, mcp_server):
-    """Test that intent is recorded on the span meta and ddtrace argument is excluded from input."""
+    """Test that intent is recorded on the span meta and telemetry argument is excluded from input."""
     from mcp.shared.memory import create_connected_server_and_client_session
 
     async def run_test():
@@ -377,7 +377,7 @@ async def run_test():
                     "operation": "add",
                     "a": 1,
                     "b": 2,
-                    "ddtrace": {"intent": "Testing intent capture for adding numbers"},
+                    "telemetry": {"intent": "Testing intent capture for adding numbers"},
                 },
             )
 
@@ -395,17 +395,17 @@ async def run_test():
     assert "intent" in server_tool_event["meta"], f"intent not in meta: {server_tool_event['meta']}"
     assert server_tool_event["meta"]["intent"] == "Testing intent capture for adding numbers"
 
-    # Verify ddtrace argument is NOT in the input value
+    # Verify telemetry argument is NOT in the input value
     input_value = json.loads(server_tool_event["meta"]["input"]["value"])
     arguments = input_value.get("params", {}).get("arguments", {})
-    assert "ddtrace" not in arguments, f"ddtrace should not be in arguments: {arguments}"
+    assert "telemetry" not in arguments, f"telemetry should not be in arguments: {arguments}"
     assert "operation" in arguments
     assert "a" in arguments
     assert "b" in arguments
 
 
 def test_intent_capture_disabled_by_default(mcp_setup, mock_tracer, llmobs_events, mcp_server):
-    """Test that intent capture is disabled by default and ddtrace property is not injected."""
+    """Test that intent capture is disabled by default and telemetry property is not injected."""
     from mcp.shared.memory import create_connected_server_and_client_session
 
     async def run_test():
@@ -418,5 +418,5 @@ async def run_test():
     tool = next(t for t in result.tools if t.name == "calculator")
     schema = tool.inputSchema
 
-    # Verify ddtrace property is NOT injected when intent capture is disabled
-    assert "ddtrace" not in schema.get("properties", {}), f"ddtrace should not be in properties: {schema}"
+    # Verify telemetry property is NOT injected when intent capture is disabled
+    assert "telemetry" not in schema.get("properties", {}), f"telemetry should not be in properties: {schema}"