feat(telemetry): Add extension name to ToolCallEvent telemetry (#12343)

Co-authored-by: Shnatu <snatu@google.com>

packages/core/src/telemetry/loggers.test.ts

@@ -1244,6 +1244,7 @@ describe('loggers', () => {
         undefined,
         undefined,
         'test-extension',
+        'test-extension-id',
       );
 
       const call: CompletedToolCall = {
@@ -1278,7 +1279,8 @@ describe('loggers', () => {
           'installation.id': 'test-installation-id',
           'event.name': EVENT_TOOL_CALL,
           'event.timestamp': '2025-01-01T00:00:00.000Z',
-          extension_id: 'test-extension',
+          extension_name: 'test-extension',
+          extension_id: 'test-extension-id',
           function_name: 'mock_mcp_tool',
           function_args: JSON.stringify(
             {

packages/core/src/telemetry/types.ts

@@ -223,6 +223,7 @@ export class ToolCallEvent implements BaseTelemetryEvent {
   tool_type: 'native' | 'mcp';
   content_length?: number;
   mcp_server_name?: string;
+  extension_name?: string;
   extension_id?: string;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   metadata?: { [key: string]: any };
@@ -269,6 +270,7 @@ export class ToolCallEvent implements BaseTelemetryEvent {
       ) {
         this.tool_type = 'mcp';
         this.mcp_server_name = call.tool.serverName;
+        this.extension_name = call.tool.extensionName;
         this.extension_id = call.tool.extensionId;
       } else {
         this.tool_type = 'native';
@@ -319,6 +321,7 @@ export class ToolCallEvent implements BaseTelemetryEvent {
       tool_type: this.tool_type,
       content_length: this.content_length,
       mcp_server_name: this.mcp_server_name,
+      extension_name: this.extension_name,
       extension_id: this.extension_id,
       metadata: this.metadata,
     };

packages/core/src/tools/mcp-client.ts

@@ -628,6 +628,7 @@ export async function discoverTools(
           mcpServerConfig.trust,
           undefined,
           cliConfig,
+          mcpServerConfig.extension?.name,
           mcpServerConfig.extension?.id,
           messageBus,
         );

packages/core/src/tools/mcp-tool.ts

@@ -218,6 +218,7 @@ export class DiscoveredMCPTool extends BaseDeclarativeTool<
     readonly trust?: boolean,
     nameOverride?: string,
     private readonly cliConfig?: Config,
+    override readonly extensionName?: string,
     override readonly extensionId?: string,
     messageBus?: MessageBus,
   ) {
@@ -230,6 +231,7 @@ export class DiscoveredMCPTool extends BaseDeclarativeTool<
       true, // isOutputMarkdown
       false, // canUpdateOutput,
       messageBus,
+      extensionName,
       extensionId,
     );
   }
@@ -244,6 +246,7 @@ export class DiscoveredMCPTool extends BaseDeclarativeTool<
       this.trust,
       `${this.serverName}__${this.serverToolName}`,
       this.cliConfig,
+      this.extensionName,
       this.extensionId,
       this.messageBus,
     );

packages/core/src/tools/tools.ts

@@ -306,6 +306,7 @@ export abstract class DeclarativeTool<
     readonly isOutputMarkdown: boolean = true,
     readonly canUpdateOutput: boolean = false,
     readonly messageBus?: MessageBus,
+    readonly extensionName?: string,
     readonly extensionId?: string,
   ) {}