From 3914351b84b8f96077b2254762e55b57e396d222 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Mon, 18 May 2026 16:50:14 +0200
Subject: [PATCH] Make tool payload tracing config key more verbose

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 docs/ai/mcp-actions.md                    | 4 ++--
 plugins/mcp-actions-backend/config.d.ts   | 6 +++---
 plugins/mcp-actions-backend/src/plugin.ts | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/ai/mcp-actions.md b/docs/ai/mcp-actions.md
index 96965f0325..187f4384d1 100644
--- a/docs/ai/mcp-actions.md
+++ b/docs/ai/mcp-actions.md
@@ -326,13 +326,13 @@ This flag is honored by every plugin that creates spans through the [Tracing Ser
 
 ### Capturing tool arguments and results
 
-When `backend.tracing.capture.toolPayloads` is enabled, the tool's input arguments and output result are recorded on the span as `gen_ai.tool.call.arguments` and `gen_ai.tool.call.result`.
+When `backend.tracing.capture.mcpActionsToolPayloads` is enabled, the tool's input arguments and output result are recorded on the span as `gen_ai.tool.call.arguments` and `gen_ai.tool.call.result`.
 
 ```yaml title="app-config.yaml"
 backend:
   tracing:
     capture:
-      toolPayloads: true # defaults to false
+      mcpActionsToolPayloads: true # defaults to false
 ```
 
 :::warning
diff --git a/plugins/mcp-actions-backend/config.d.ts b/plugins/mcp-actions-backend/config.d.ts
index a20ab6d4b8..cf70e187ad 100644
--- a/plugins/mcp-actions-backend/config.d.ts
+++ b/plugins/mcp-actions-backend/config.d.ts
@@ -19,15 +19,15 @@ export interface Config {
     tracing?: {
       capture?: {
         /**
-         * When true, the tool call's input arguments and output result are
-         * included on the MCP `tools/call` server span as
+         * When true, the MCP tool call's input arguments and output result
+         * are included on the MCP `tools/call` server span as
          * `gen_ai.tool.call.arguments` and `gen_ai.tool.call.result`.
          * These attributes are marked Opt-In by the OpenTelemetry GenAI
          * semantic conventions because they may contain sensitive
          * information (entity payloads, scaffolder inputs, free-form
          * text). Defaults to false.
          */
-        toolPayloads?: boolean;
+        mcpActionsToolPayloads?: boolean;
       };
     };
   };
diff --git a/plugins/mcp-actions-backend/src/plugin.ts b/plugins/mcp-actions-backend/src/plugin.ts
index 526474e5b4..bbc2c6719d 100644
--- a/plugins/mcp-actions-backend/src/plugin.ts
+++ b/plugins/mcp-actions-backend/src/plugin.ts
@@ -68,8 +68,9 @@ export const mcpPlugin = createBackendPlugin({
           'mcpActions.namespacedToolNames',
         );
         const captureToolPayloads =
-          config.getOptionalBoolean('backend.tracing.capture.toolPayloads') ??
-          false;
+          config.getOptionalBoolean(
+            'backend.tracing.capture.mcpActionsToolPayloads',
+          ) ?? false;
 
         const mcpService = await McpService.create({
           actions,