@google/gemini-cli-core 0.0.77777772 → 0.0.77777774

package/dist/src/telemetry/metrics.test.js

@@ -6,7 +6,8 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { FileOperation, MemoryMetricType, ToolExecutionPhase, ApiRequestPhase, } from './metrics.js';
 import { makeFakeConfig } from '../test-utils/config.js';
-import { ModelRoutingEvent } from './types.js';
+import { ModelRoutingEvent, AgentFinishEvent } from './types.js';
+import { AgentTerminateMode } from '../agents/types.js';
 const mockCounterAddFn = vi.fn();
 const mockHistogramRecordFn = vi.fn();
 const mockCreateCounterFn = vi.fn();
@@ -34,9 +35,15 @@ function originalOtelMockFactory() {
             setLogger: vi.fn(),
             warn: vi.fn(),
         },
+        DiagConsoleLogger: vi.fn(),
+        DiagLogLevel: {
+            NONE: 0,
+            INFO: 1,
+        },
     };
 }
 vi.mock('@opentelemetry/api');
+vi.mock('./telemetryAttributes.js');
 describe('Telemetry Metrics', () => {
     let initializeMetricsModule;
     let recordTokenUsageMetricsModule;
@@ -53,6 +60,10 @@ describe('Telemetry Metrics', () => {
     let recordPerformanceScoreModule;
     let recordPerformanceRegressionModule;
     let recordBaselineComparisonModule;
+    let recordGenAiClientTokenUsageModule;
+    let recordGenAiClientOperationDurationModule;
+    let recordFlickerFrameModule;
+    let recordAgentRunMetricsModule;
     beforeEach(async () => {
         vi.resetModules();
         vi.doMock('@opentelemetry/api', () => {
@@ -60,6 +71,12 @@ describe('Telemetry Metrics', () => {
             actualApi.metrics.getMeter.mockReturnValue(mockMeterInstance);
             return actualApi;
         });
+        const { getCommonAttributes } = await import('./telemetryAttributes.js');
+        getCommonAttributes.mockReturnValue({
+            'session.id': 'test-session-id',
+            'installation.id': 'test-installation-id',
+            'user.email': 'test@example.com',
+        });
         const metricsJsModule = await import('./metrics.js');
         initializeMetricsModule = metricsJsModule.initializeMetrics;
         recordTokenUsageMetricsModule = metricsJsModule.recordTokenUsageMetrics;
@@ -79,6 +96,12 @@ describe('Telemetry Metrics', () => {
         recordPerformanceRegressionModule =
             metricsJsModule.recordPerformanceRegression;
         recordBaselineComparisonModule = metricsJsModule.recordBaselineComparison;
+        recordGenAiClientTokenUsageModule =
+            metricsJsModule.recordGenAiClientTokenUsage;
+        recordGenAiClientOperationDurationModule =
+            metricsJsModule.recordGenAiClientOperationDuration;
+        recordFlickerFrameModule = metricsJsModule.recordFlickerFrame;
+        recordAgentRunMetricsModule = metricsJsModule.recordAgentRunMetrics;
         const otelApiModule = await import('@opentelemetry/api');
         mockCounterAddFn.mockClear();
         mockCreateCounterFn.mockClear();
@@ -89,6 +112,39 @@ describe('Telemetry Metrics', () => {
         mockCreateCounterFn.mockReturnValue(mockCounterInstance);
         mockCreateHistogramFn.mockReturnValue(mockHistogramInstance);
     });
+    describe('recordFlickerFrame', () => {
+        it('does not record metrics if not initialized', () => {
+            const config = makeFakeConfig({});
+            recordFlickerFrameModule(config);
+            expect(mockCounterAddFn).not.toHaveBeenCalled();
+        });
+        it('records a flicker frame event when initialized', () => {
+            const config = makeFakeConfig({});
+            initializeMetricsModule(config);
+            recordFlickerFrameModule(config);
+            // Called for session, then for flicker
+            expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
+            expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
+                'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
+            });
+        });
+    });
+    describe('initializeMetrics', () => {
+        const mockConfig = {
+            getSessionId: () => 'test-session-id',
+            getTelemetryEnabled: () => true,
+        };
+        it('should apply common attributes including email', () => {
+            initializeMetricsModule(mockConfig);
+            expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
+                'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
+            });
+        });
+    });
     describe('recordChatCompressionMetrics', () => {
         it('does not record metrics if not initialized', () => {
             const lol = makeFakeConfig({});
@@ -107,6 +163,8 @@ describe('Telemetry Metrics', () => {
             });
             expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 tokens_after: 100,
                 tokens_before: 200,
             });
@@ -118,18 +176,28 @@ describe('Telemetry Metrics', () => {
             getTelemetryEnabled: () => true,
         };
         it('should not record metrics if not initialized', () => {
-            recordTokenUsageMetricsModule(mockConfig, 'gemini-pro', 100, 'input');
+            recordTokenUsageMetricsModule(mockConfig, 100, {
+                model: 'gemini-pro',
+                type: 'input',
+            });
             expect(mockCounterAddFn).not.toHaveBeenCalled();
         });
         it('should record token usage with the correct attributes', () => {
             initializeMetricsModule(mockConfig);
-            recordTokenUsageMetricsModule(mockConfig, 'gemini-pro', 100, 'input');
+            recordTokenUsageMetricsModule(mockConfig, 100, {
+                model: 'gemini-pro',
+                type: 'input',
+            });
             expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
             expect(mockCounterAddFn).toHaveBeenNthCalledWith(1, 1, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
             });
             expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 100, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 model: 'gemini-pro',
                 type: 'input',
             });
@@ -137,27 +205,47 @@ describe('Telemetry Metrics', () => {
         it('should record token usage for different types', () => {
             initializeMetricsModule(mockConfig);
             mockCounterAddFn.mockClear();
-            recordTokenUsageMetricsModule(mockConfig, 'gemini-pro', 50, 'output');
+            recordTokenUsageMetricsModule(mockConfig, 50, {
+                model: 'gemini-pro',
+                type: 'output',
+            });
             expect(mockCounterAddFn).toHaveBeenCalledWith(50, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 model: 'gemini-pro',
                 type: 'output',
             });
-            recordTokenUsageMetricsModule(mockConfig, 'gemini-pro', 25, 'thought');
+            recordTokenUsageMetricsModule(mockConfig, 25, {
+                model: 'gemini-pro',
+                type: 'thought',
+            });
             expect(mockCounterAddFn).toHaveBeenCalledWith(25, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 model: 'gemini-pro',
                 type: 'thought',
             });
-            recordTokenUsageMetricsModule(mockConfig, 'gemini-pro', 75, 'cache');
+            recordTokenUsageMetricsModule(mockConfig, 75, {
+                model: 'gemini-pro',
+                type: 'cache',
+            });
             expect(mockCounterAddFn).toHaveBeenCalledWith(75, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 model: 'gemini-pro',
                 type: 'cache',
             });
-            recordTokenUsageMetricsModule(mockConfig, 'gemini-pro', 125, 'tool');
+            recordTokenUsageMetricsModule(mockConfig, 125, {
+                model: 'gemini-pro',
+                type: 'tool',
+            });
             expect(mockCounterAddFn).toHaveBeenCalledWith(125, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 model: 'gemini-pro',
                 type: 'tool',
             });
@@ -165,9 +253,14 @@ describe('Telemetry Metrics', () => {
         it('should handle different models', () => {
             initializeMetricsModule(mockConfig);
             mockCounterAddFn.mockClear();
-            recordTokenUsageMetricsModule(mockConfig, 'gemini-ultra', 200, 'input');
+            recordTokenUsageMetricsModule(mockConfig, 200, {
+                model: 'gemini-ultra',
+                type: 'input',
+            });
             expect(mockCounterAddFn).toHaveBeenCalledWith(200, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 model: 'gemini-ultra',
                 type: 'input',
             });
@@ -179,18 +272,32 @@ describe('Telemetry Metrics', () => {
             getTelemetryEnabled: () => true,
         };
         it('should not record metrics if not initialized', () => {
-            recordFileOperationMetricModule(mockConfig, FileOperation.CREATE, 10, 'text/plain', 'txt');
+            recordFileOperationMetricModule(mockConfig, {
+                operation: FileOperation.CREATE,
+                lines: 10,
+                mimetype: 'text/plain',
+                extension: 'txt',
+            });
             expect(mockCounterAddFn).not.toHaveBeenCalled();
         });
         it('should record file creation with all attributes', () => {
             initializeMetricsModule(mockConfig);
-            recordFileOperationMetricModule(mockConfig, FileOperation.CREATE, 10, 'text/plain', 'txt');
+            recordFileOperationMetricModule(mockConfig, {
+                operation: FileOperation.CREATE,
+                lines: 10,
+                mimetype: 'text/plain',
+                extension: 'txt',
+            });
             expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
             expect(mockCounterAddFn).toHaveBeenNthCalledWith(1, 1, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
             });
             expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 operation: FileOperation.CREATE,
                 lines: 10,
                 mimetype: 'text/plain',
@@ -200,18 +307,27 @@ describe('Telemetry Metrics', () => {
         it('should record file read with minimal attributes', () => {
             initializeMetricsModule(mockConfig);
             mockCounterAddFn.mockClear();
-            recordFileOperationMetricModule(mockConfig, FileOperation.READ);
+            recordFileOperationMetricModule(mockConfig, {
+                operation: FileOperation.READ,
+            });
             expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 operation: FileOperation.READ,
             });
         });
         it('should record file update with some attributes', () => {
             initializeMetricsModule(mockConfig);
             mockCounterAddFn.mockClear();
-            recordFileOperationMetricModule(mockConfig, FileOperation.UPDATE, undefined, 'application/javascript');
+            recordFileOperationMetricModule(mockConfig, {
+                operation: FileOperation.UPDATE,
+                mimetype: 'application/javascript',
+            });
             expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 operation: FileOperation.UPDATE,
                 mimetype: 'application/javascript',
             });
@@ -219,18 +335,29 @@ describe('Telemetry Metrics', () => {
         it('should record file operation without diffStat', () => {
             initializeMetricsModule(mockConfig);
             mockCounterAddFn.mockClear();
-            recordFileOperationMetricModule(mockConfig, FileOperation.UPDATE, undefined, undefined, undefined);
+            recordFileOperationMetricModule(mockConfig, {
+                operation: FileOperation.UPDATE,
+            });
             expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 operation: FileOperation.UPDATE,
             });
         });
         it('should record minimal file operation when optional parameters are undefined', () => {
             initializeMetricsModule(mockConfig);
             mockCounterAddFn.mockClear();
-            recordFileOperationMetricModule(mockConfig, FileOperation.UPDATE, 10, 'text/plain', 'txt', undefined);
+            recordFileOperationMetricModule(mockConfig, {
+                operation: FileOperation.UPDATE,
+                lines: 10,
+                mimetype: 'text/plain',
+                extension: 'txt',
+            });
             expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 operation: FileOperation.UPDATE,
                 lines: 10,
                 mimetype: 'text/plain',
@@ -240,9 +367,13 @@ describe('Telemetry Metrics', () => {
         it('should not include diffStat attributes when diffStat is not provided', () => {
             initializeMetricsModule(mockConfig);
             mockCounterAddFn.mockClear();
-            recordFileOperationMetricModule(mockConfig, FileOperation.UPDATE, undefined, undefined, undefined);
+            recordFileOperationMetricModule(mockConfig, {
+                operation: FileOperation.UPDATE,
+            });
             expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 operation: FileOperation.UPDATE,
             });
         });
@@ -264,6 +395,8 @@ describe('Telemetry Metrics', () => {
             recordModelRoutingMetricsModule(mockConfig, event);
             expect(mockHistogramRecordFn).toHaveBeenCalledWith(150, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 'routing.decision_model': 'gemini-pro',
                 'routing.decision_source': 'default',
             });
@@ -276,17 +409,226 @@ describe('Telemetry Metrics', () => {
             recordModelRoutingMetricsModule(mockConfig, event);
             expect(mockHistogramRecordFn).toHaveBeenCalledWith(200, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 'routing.decision_model': 'gemini-pro',
                 'routing.decision_source': 'classifier',
             });
             expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
             expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
                 'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
                 'routing.decision_source': 'classifier',
                 'routing.error_message': 'test-error',
             });
         });
     });
+    describe('recordAgentRunMetrics', () => {
+        const mockConfig = {
+            getSessionId: () => 'test-session-id',
+            getTelemetryEnabled: () => true,
+        };
+        it('should not record metrics if not initialized', () => {
+            const event = new AgentFinishEvent('agent-123', 'TestAgent', 1000, 5, AgentTerminateMode.GOAL);
+            recordAgentRunMetricsModule(mockConfig, event);
+            expect(mockCounterAddFn).not.toHaveBeenCalled();
+            expect(mockHistogramRecordFn).not.toHaveBeenCalled();
+        });
+        it('should record agent run metrics', () => {
+            initializeMetricsModule(mockConfig);
+            mockCounterAddFn.mockClear();
+            mockHistogramRecordFn.mockClear();
+            const event = new AgentFinishEvent('agent-123', 'TestAgent', 1000, 5, AgentTerminateMode.GOAL);
+            recordAgentRunMetricsModule(mockConfig, event);
+            // Verify agent run counter
+            expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
+                'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
+                agent_name: 'TestAgent',
+                terminate_reason: 'GOAL',
+            });
+            // Verify agent duration histogram
+            expect(mockHistogramRecordFn).toHaveBeenCalledWith(1000, {
+                'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
+                agent_name: 'TestAgent',
+            });
+            // Verify agent turns histogram
+            expect(mockHistogramRecordFn).toHaveBeenCalledWith(5, {
+                'session.id': 'test-session-id',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
+                agent_name: 'TestAgent',
+            });
+        });
+    });
+    describe('OpenTelemetry GenAI Semantic Convention Metrics', () => {
+        const mockConfig = {
+            getSessionId: () => 'test-session-id',
+            getTelemetryEnabled: () => true,
+        };
+        describe('recordGenAiClientTokenUsage', () => {
+            it('should not record metrics when not initialized', () => {
+                recordGenAiClientTokenUsageModule(mockConfig, 100, {
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.gen_ai',
+                    'gen_ai.token.type': 'input',
+                });
+                expect(mockHistogramRecordFn).not.toHaveBeenCalled();
+            });
+            it('should record input token usage with correct attributes', () => {
+                initializeMetricsModule(mockConfig);
+                mockHistogramRecordFn.mockClear();
+                recordGenAiClientTokenUsageModule(mockConfig, 150, {
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.gen_ai',
+                    'gen_ai.token.type': 'input',
+                    'gen_ai.request.model': 'gemini-2.0-flash',
+                    'gen_ai.response.model': 'gemini-2.0-flash',
+                });
+                expect(mockHistogramRecordFn).toHaveBeenCalledWith(150, {
+                    'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.gen_ai',
+                    'gen_ai.token.type': 'input',
+                    'gen_ai.request.model': 'gemini-2.0-flash',
+                    'gen_ai.response.model': 'gemini-2.0-flash',
+                });
+            });
+            it('should record output token usage with correct attributes', () => {
+                initializeMetricsModule(mockConfig);
+                mockHistogramRecordFn.mockClear();
+                recordGenAiClientTokenUsageModule(mockConfig, 75, {
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.vertex_ai',
+                    'gen_ai.token.type': 'output',
+                    'gen_ai.request.model': 'gemini-pro',
+                });
+                expect(mockHistogramRecordFn).toHaveBeenCalledWith(75, {
+                    'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.vertex_ai',
+                    'gen_ai.token.type': 'output',
+                    'gen_ai.request.model': 'gemini-pro',
+                });
+            });
+            it('should record token usage with optional attributes', () => {
+                initializeMetricsModule(mockConfig);
+                mockHistogramRecordFn.mockClear();
+                recordGenAiClientTokenUsageModule(mockConfig, 200, {
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.vertex_ai',
+                    'gen_ai.token.type': 'input',
+                    'gen_ai.request.model': 'text-embedding-004',
+                    'server.address': 'aiplatform.googleapis.com',
+                    'server.port': 443,
+                });
+                expect(mockHistogramRecordFn).toHaveBeenCalledWith(200, {
+                    'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.vertex_ai',
+                    'gen_ai.token.type': 'input',
+                    'gen_ai.request.model': 'text-embedding-004',
+                    'server.address': 'aiplatform.googleapis.com',
+                    'server.port': 443,
+                });
+            });
+        });
+        describe('recordGenAiClientOperationDuration', () => {
+            it('should not record metrics when not initialized', () => {
+                recordGenAiClientOperationDurationModule(mockConfig, 2.5, {
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.gen_ai',
+                });
+                expect(mockHistogramRecordFn).not.toHaveBeenCalled();
+            });
+            it('should record successful operation duration with correct attributes', () => {
+                initializeMetricsModule(mockConfig);
+                mockHistogramRecordFn.mockClear();
+                recordGenAiClientOperationDurationModule(mockConfig, 1.25, {
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.gen_ai',
+                    'gen_ai.request.model': 'gemini-2.0-flash',
+                    'gen_ai.response.model': 'gemini-2.0-flash',
+                });
+                expect(mockHistogramRecordFn).toHaveBeenCalledWith(1.25, {
+                    'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.gen_ai',
+                    'gen_ai.request.model': 'gemini-2.0-flash',
+                    'gen_ai.response.model': 'gemini-2.0-flash',
+                });
+            });
+            it('should record failed operation duration with error type', () => {
+                initializeMetricsModule(mockConfig);
+                mockHistogramRecordFn.mockClear();
+                recordGenAiClientOperationDurationModule(mockConfig, 3.75, {
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.vertex_ai',
+                    'gen_ai.request.model': 'gemini-pro',
+                    'error.type': 'quota_exceeded',
+                });
+                expect(mockHistogramRecordFn).toHaveBeenCalledWith(3.75, {
+                    'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.vertex_ai',
+                    'gen_ai.request.model': 'gemini-pro',
+                    'error.type': 'quota_exceeded',
+                });
+            });
+            it('should record operation duration with server details', () => {
+                initializeMetricsModule(mockConfig);
+                mockHistogramRecordFn.mockClear();
+                recordGenAiClientOperationDurationModule(mockConfig, 0.95, {
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.vertex_ai',
+                    'gen_ai.request.model': 'gemini-1.5-pro',
+                    'gen_ai.response.model': 'gemini-1.5-pro-001',
+                    'server.address': 'us-central1-aiplatform.googleapis.com',
+                    'server.port': 443,
+                });
+                expect(mockHistogramRecordFn).toHaveBeenCalledWith(0.95, {
+                    'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.vertex_ai',
+                    'gen_ai.request.model': 'gemini-1.5-pro',
+                    'gen_ai.response.model': 'gemini-1.5-pro-001',
+                    'server.address': 'us-central1-aiplatform.googleapis.com',
+                    'server.port': 443,
+                });
+            });
+            it('should handle minimal required attributes', () => {
+                initializeMetricsModule(mockConfig);
+                mockHistogramRecordFn.mockClear();
+                recordGenAiClientOperationDurationModule(mockConfig, 2.1, {
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.gen_ai',
+                });
+                expect(mockHistogramRecordFn).toHaveBeenCalledWith(2.1, {
+                    'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
+                    'gen_ai.operation.name': 'generate_content',
+                    'gen_ai.provider.name': 'gcp.gen_ai',
+                });
+            });
+        });
+    });
     describe('Performance Monitoring Metrics', () => {
         const mockConfig = {
             getSessionId: () => 'test-session-id',
@@ -301,21 +643,29 @@ describe('Telemetry Metrics', () => {
                 };
                 initializeMetricsModule(mockConfigDisabled);
                 mockHistogramRecordFn.mockClear();
-                recordStartupPerformanceModule(mockConfigDisabled, 'settings_loading', 100, {
-                    auth_type: 'gemini',
+                recordStartupPerformanceModule(mockConfigDisabled, 100, {
+                    phase: 'settings_loading',
+                    details: {
+                        auth_type: 'gemini',
+                    },
                 });
                 expect(mockHistogramRecordFn).not.toHaveBeenCalled();
             });
             it('should record startup performance with phase and details', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordStartupPerformanceModule(mockConfig, 'settings_loading', 150, {
-                    auth_type: 'gemini',
-                    telemetry_enabled: true,
-                    settings_sources: 2,
+                recordStartupPerformanceModule(mockConfig, 150, {
+                    phase: 'settings_loading',
+                    details: {
+                        auth_type: 'gemini',
+                        telemetry_enabled: true,
+                        settings_sources: 2,
+                    },
                 });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(150, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     phase: 'settings_loading',
                     auth_type: 'gemini',
                     telemetry_enabled: true,
@@ -325,9 +675,11 @@ describe('Telemetry Metrics', () => {
             it('should record startup performance without details', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordStartupPerformanceModule(mockConfig, 'cleanup', 50);
+                recordStartupPerformanceModule(mockConfig, 50, { phase: 'cleanup' });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(50, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     phase: 'cleanup',
                 });
             });
@@ -336,12 +688,17 @@ describe('Telemetry Metrics', () => {
                 mockHistogramRecordFn.mockClear();
                 // Test with realistic floating-point values that performance.now() would return
                 const floatingPointDuration = 123.45678;
-                recordStartupPerformanceModule(mockConfig, 'total_startup', floatingPointDuration, {
-                    is_tty: true,
-                    has_question: false,
+                recordStartupPerformanceModule(mockConfig, floatingPointDuration, {
+                    phase: 'total_startup',
+                    details: {
+                        is_tty: true,
+                        has_question: false,
+                    },
                 });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(floatingPointDuration, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     phase: 'total_startup',
                     is_tty: true,
                     has_question: false,
@@ -352,9 +709,14 @@ describe('Telemetry Metrics', () => {
             it('should record memory usage for different memory types', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordMemoryUsageModule(mockConfig, MemoryMetricType.HEAP_USED, 15728640, 'startup');
+                recordMemoryUsageModule(mockConfig, 15728640, {
+                    memory_type: MemoryMetricType.HEAP_USED,
+                    component: 'startup',
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(15728640, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     memory_type: 'heap_used',
                     component: 'startup',
                 });
@@ -362,22 +724,37 @@ describe('Telemetry Metrics', () => {
             it('should record memory usage for all memory metric types', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordMemoryUsageModule(mockConfig, MemoryMetricType.HEAP_TOTAL, 31457280, 'api_call');
-                recordMemoryUsageModule(mockConfig, MemoryMetricType.EXTERNAL, 2097152, 'tool_execution');
-                recordMemoryUsageModule(mockConfig, MemoryMetricType.RSS, 41943040, 'memory_monitor');
+                recordMemoryUsageModule(mockConfig, 31457280, {
+                    memory_type: MemoryMetricType.HEAP_TOTAL,
+                    component: 'api_call',
+                });
+                recordMemoryUsageModule(mockConfig, 2097152, {
+                    memory_type: MemoryMetricType.EXTERNAL,
+                    component: 'tool_execution',
+                });
+                recordMemoryUsageModule(mockConfig, 41943040, {
+                    memory_type: MemoryMetricType.RSS,
+                    component: 'memory_monitor',
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledTimes(3); // One for each call
                 expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(1, 31457280, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     memory_type: 'heap_total',
                     component: 'api_call',
                 });
                 expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(2, 2097152, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     memory_type: 'external',
                     component: 'tool_execution',
                 });
                 expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(3, 41943040, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     memory_type: 'rss',
                     component: 'memory_monitor',
                 });
@@ -385,11 +762,14 @@ describe('Telemetry Metrics', () => {
             it('should record memory usage without component', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordMemoryUsageModule(mockConfig, MemoryMetricType.HEAP_USED, 15728640);
+                recordMemoryUsageModule(mockConfig, 15728640, {
+                    memory_type: MemoryMetricType.HEAP_USED,
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(15728640, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     memory_type: 'heap_used',
-                    component: undefined,
                 });
             });
         });
@@ -397,19 +777,24 @@ describe('Telemetry Metrics', () => {
             it('should record CPU usage percentage', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordCpuUsageModule(mockConfig, 85.5, 'tool_execution');
+                recordCpuUsageModule(mockConfig, 85.5, {
+                    component: 'tool_execution',
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(85.5, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     component: 'tool_execution',
                 });
             });
             it('should record CPU usage without component', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordCpuUsageModule(mockConfig, 42.3);
+                recordCpuUsageModule(mockConfig, 42.3, {});
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(42.3, {
                     'session.id': 'test-session-id',
-                    component: undefined,
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                 });
             });
         });
@@ -420,6 +805,8 @@ describe('Telemetry Metrics', () => {
                 recordToolQueueDepthModule(mockConfig, 3);
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(3, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                 });
             });
             it('should record zero queue depth', () => {
@@ -428,6 +815,8 @@ describe('Telemetry Metrics', () => {
                 recordToolQueueDepthModule(mockConfig, 0);
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(0, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                 });
             });
         });
@@ -435,9 +824,14 @@ describe('Telemetry Metrics', () => {
             it('should record tool execution breakdown for all phases', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordToolExecutionBreakdownModule(mockConfig, 'Read', ToolExecutionPhase.VALIDATION, 25);
+                recordToolExecutionBreakdownModule(mockConfig, 25, {
+                    function_name: 'Read',
+                    phase: ToolExecutionPhase.VALIDATION,
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(25, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     function_name: 'Read',
                     phase: 'validation',
                 });
@@ -445,22 +839,37 @@ describe('Telemetry Metrics', () => {
             it('should record execution breakdown for different phases', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordToolExecutionBreakdownModule(mockConfig, 'Bash', ToolExecutionPhase.PREPARATION, 50);
-                recordToolExecutionBreakdownModule(mockConfig, 'Bash', ToolExecutionPhase.EXECUTION, 1500);
-                recordToolExecutionBreakdownModule(mockConfig, 'Bash', ToolExecutionPhase.RESULT_PROCESSING, 75);
+                recordToolExecutionBreakdownModule(mockConfig, 50, {
+                    function_name: 'Bash',
+                    phase: ToolExecutionPhase.PREPARATION,
+                });
+                recordToolExecutionBreakdownModule(mockConfig, 1500, {
+                    function_name: 'Bash',
+                    phase: ToolExecutionPhase.EXECUTION,
+                });
+                recordToolExecutionBreakdownModule(mockConfig, 75, {
+                    function_name: 'Bash',
+                    phase: ToolExecutionPhase.RESULT_PROCESSING,
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledTimes(3); // One for each call
                 expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(1, 50, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     function_name: 'Bash',
                     phase: 'preparation',
                 });
                 expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(2, 1500, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     function_name: 'Bash',
                     phase: 'execution',
                 });
                 expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(3, 75, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     function_name: 'Bash',
                     phase: 'result_processing',
                 });
@@ -470,9 +879,15 @@ describe('Telemetry Metrics', () => {
             it('should record token efficiency metrics', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordTokenEfficiencyModule(mockConfig, 'gemini-pro', 'cache_hit_rate', 0.85, 'api_request');
+                recordTokenEfficiencyModule(mockConfig, 0.85, {
+                    model: 'gemini-pro',
+                    metric: 'cache_hit_rate',
+                    context: 'api_request',
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(0.85, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     model: 'gemini-pro',
                     metric: 'cache_hit_rate',
                     context: 'api_request',
@@ -481,12 +896,16 @@ describe('Telemetry Metrics', () => {
             it('should record token efficiency without context', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordTokenEfficiencyModule(mockConfig, 'gemini-pro', 'tokens_per_operation', 125.5);
+                recordTokenEfficiencyModule(mockConfig, 125.5, {
+                    model: 'gemini-pro',
+                    metric: 'tokens_per_operation',
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(125.5, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     model: 'gemini-pro',
                     metric: 'tokens_per_operation',
-                    context: undefined,
                 });
             });
         });
@@ -494,9 +913,14 @@ describe('Telemetry Metrics', () => {
             it('should record API request breakdown for all phases', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordApiRequestBreakdownModule(mockConfig, 'gemini-pro', ApiRequestPhase.REQUEST_PREPARATION, 15);
+                recordApiRequestBreakdownModule(mockConfig, 15, {
+                    model: 'gemini-pro',
+                    phase: ApiRequestPhase.REQUEST_PREPARATION,
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(15, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     model: 'gemini-pro',
                     phase: 'request_preparation',
                 });
@@ -504,22 +928,37 @@ describe('Telemetry Metrics', () => {
             it('should record API request breakdown for different phases', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordApiRequestBreakdownModule(mockConfig, 'gemini-pro', ApiRequestPhase.NETWORK_LATENCY, 250);
-                recordApiRequestBreakdownModule(mockConfig, 'gemini-pro', ApiRequestPhase.RESPONSE_PROCESSING, 100);
-                recordApiRequestBreakdownModule(mockConfig, 'gemini-pro', ApiRequestPhase.TOKEN_PROCESSING, 50);
+                recordApiRequestBreakdownModule(mockConfig, 250, {
+                    model: 'gemini-pro',
+                    phase: ApiRequestPhase.NETWORK_LATENCY,
+                });
+                recordApiRequestBreakdownModule(mockConfig, 100, {
+                    model: 'gemini-pro',
+                    phase: ApiRequestPhase.RESPONSE_PROCESSING,
+                });
+                recordApiRequestBreakdownModule(mockConfig, 50, {
+                    model: 'gemini-pro',
+                    phase: ApiRequestPhase.TOKEN_PROCESSING,
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledTimes(3); // One for each call
                 expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(1, 250, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     model: 'gemini-pro',
                     phase: 'network_latency',
                 });
                 expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(2, 100, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     model: 'gemini-pro',
                     phase: 'response_processing',
                 });
                 expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(3, 50, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     model: 'gemini-pro',
                     phase: 'token_processing',
                 });
@@ -529,9 +968,14 @@ describe('Telemetry Metrics', () => {
             it('should record performance score with category and baseline', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordPerformanceScoreModule(mockConfig, 85.5, 'memory_efficiency', 80.0);
+                recordPerformanceScoreModule(mockConfig, 85.5, {
+                    category: 'memory_efficiency',
+                    baseline: 80.0,
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(85.5, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     category: 'memory_efficiency',
                     baseline: 80.0,
                 });
@@ -539,11 +983,14 @@ describe('Telemetry Metrics', () => {
             it('should record performance score without baseline', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordPerformanceScoreModule(mockConfig, 92.3, 'overall_performance');
+                recordPerformanceScoreModule(mockConfig, 92.3, {
+                    category: 'overall_performance',
+                });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(92.3, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     category: 'overall_performance',
-                    baseline: undefined,
                 });
             });
         });
@@ -552,10 +999,17 @@ describe('Telemetry Metrics', () => {
                 initializeMetricsModule(mockConfig);
                 mockCounterAddFn.mockClear();
                 mockHistogramRecordFn.mockClear();
-                recordPerformanceRegressionModule(mockConfig, 'startup_time', 1200, 1000, 'medium');
+                recordPerformanceRegressionModule(mockConfig, {
+                    metric: 'startup_time',
+                    current_value: 1200,
+                    baseline_value: 1000,
+                    severity: 'medium',
+                });
                 // Verify regression counter
                 expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     metric: 'startup_time',
                     severity: 'medium',
                     current_value: 1200,
@@ -564,6 +1018,8 @@ describe('Telemetry Metrics', () => {
                 // Verify baseline comparison histogram (20% increase)
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(20, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     metric: 'startup_time',
                     severity: 'medium',
                     current_value: 1200,
@@ -574,10 +1030,17 @@ describe('Telemetry Metrics', () => {
                 initializeMetricsModule(mockConfig);
                 mockCounterAddFn.mockClear();
                 mockHistogramRecordFn.mockClear();
-                recordPerformanceRegressionModule(mockConfig, 'memory_usage', 100, 0, 'high');
+                recordPerformanceRegressionModule(mockConfig, {
+                    metric: 'memory_usage',
+                    current_value: 100,
+                    baseline_value: 0,
+                    severity: 'high',
+                });
                 // Verify regression counter still recorded
                 expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     metric: 'memory_usage',
                     severity: 'high',
                     current_value: 100,
@@ -589,10 +1052,22 @@ describe('Telemetry Metrics', () => {
             it('should record different severity levels', () => {
                 initializeMetricsModule(mockConfig);
                 mockCounterAddFn.mockClear();
-                recordPerformanceRegressionModule(mockConfig, 'api_latency', 500, 400, 'low');
-                recordPerformanceRegressionModule(mockConfig, 'cpu_usage', 90, 70, 'high');
+                recordPerformanceRegressionModule(mockConfig, {
+                    metric: 'api_latency',
+                    current_value: 500,
+                    baseline_value: 400,
+                    severity: 'low',
+                });
+                recordPerformanceRegressionModule(mockConfig, {
+                    metric: 'cpu_usage',
+                    current_value: 90,
+                    baseline_value: 70,
+                    severity: 'high',
+                });
                 expect(mockCounterAddFn).toHaveBeenNthCalledWith(1, 1, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     metric: 'api_latency',
                     severity: 'low',
                     current_value: 500,
@@ -600,6 +1075,8 @@ describe('Telemetry Metrics', () => {
                 });
                 expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     metric: 'cpu_usage',
                     severity: 'high',
                     current_value: 90,
@@ -611,10 +1088,17 @@ describe('Telemetry Metrics', () => {
             it('should record baseline comparison with percentage change', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordBaselineComparisonModule(mockConfig, 'memory_usage', 120, 100, 'performance_tracking');
+                recordBaselineComparisonModule(mockConfig, {
+                    metric: 'memory_usage',
+                    current_value: 120,
+                    baseline_value: 100,
+                    category: 'performance_tracking',
+                });
                 // 20% increase: (120 - 100) / 100 * 100 = 20%
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(20, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     metric: 'memory_usage',
                     category: 'performance_tracking',
                     current_value: 120,
@@ -624,10 +1108,17 @@ describe('Telemetry Metrics', () => {
             it('should handle negative percentage change (improvement)', () => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordBaselineComparisonModule(mockConfig, 'startup_time', 800, 1000, 'optimization');
+                recordBaselineComparisonModule(mockConfig, {
+                    metric: 'startup_time',
+                    current_value: 800,
+                    baseline_value: 1000,
+                    category: 'optimization',
+                });
                 // 20% decrease: (800 - 1000) / 1000 * 100 = -20%
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(-20, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     metric: 'startup_time',
                     category: 'optimization',
                     current_value: 800,
@@ -640,7 +1131,12 @@ describe('Telemetry Metrics', () => {
                 const diagSpy = vi.spyOn(mockedModule.diag, 'warn');
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordBaselineComparisonModule(mockConfig, 'new_metric', 50, 0, 'testing');
+                recordBaselineComparisonModule(mockConfig, {
+                    metric: 'new_metric',
+                    current_value: 50,
+                    baseline_value: 0,
+                    category: 'testing',
+                });
                 expect(diagSpy).toHaveBeenCalledWith('Baseline value is zero, skipping comparison.');
                 expect(mockHistogramRecordFn).not.toHaveBeenCalled();
             });