@office-ai/aioncli-core 0.8.1 → 0.18.4

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,13 @@ describe('Telemetry Metrics', () => {
     let recordPerformanceScoreModule;
     let recordPerformanceRegressionModule;
     let recordBaselineComparisonModule;
+    let recordGenAiClientTokenUsageModule;
+    let recordGenAiClientOperationDurationModule;
+    let recordFlickerFrameModule;
+    let recordExitFailModule;
+    let recordAgentRunMetricsModule;
+    let recordLinesChangedModule;
+    let recordSlowRenderModule;
     beforeEach(async () => {
         vi.resetModules();
         vi.doMock('@opentelemetry/api', () => {
@@ -60,6 +74,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 +99,15 @@ describe('Telemetry Metrics', () => {
         recordPerformanceRegressionModule =
             metricsJsModule.recordPerformanceRegression;
         recordBaselineComparisonModule = metricsJsModule.recordBaselineComparison;
+        recordGenAiClientTokenUsageModule =
+            metricsJsModule.recordGenAiClientTokenUsage;
+        recordGenAiClientOperationDurationModule =
+            metricsJsModule.recordGenAiClientOperationDuration;
+        recordFlickerFrameModule = metricsJsModule.recordFlickerFrame;
+        recordExitFailModule = metricsJsModule.recordExitFail;
+        recordAgentRunMetricsModule = metricsJsModule.recordAgentRunMetrics;
+        recordLinesChangedModule = metricsJsModule.recordLinesChanged;
+        recordSlowRenderModule = metricsJsModule.recordSlowRender;
         const otelApiModule = await import('@opentelemetry/api');
         mockCounterAddFn.mockClear();
         mockCreateCounterFn.mockClear();
@@ -89,6 +118,75 @@ 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('recordExitFail', () => {
+        it('does not record metrics if not initialized', () => {
+            const config = makeFakeConfig({});
+            recordExitFailModule(config);
+            expect(mockCounterAddFn).not.toHaveBeenCalled();
+        });
+        it('records a exit fail event when initialized', () => {
+            const config = makeFakeConfig({});
+            initializeMetricsModule(config);
+            recordExitFailModule(config);
+            // Called for session, then for exit fail
+            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('recordSlowRender', () => {
+        it('does not record metrics if not initialized', () => {
+            const config = makeFakeConfig({});
+            recordSlowRenderModule(config, 123);
+            expect(mockHistogramRecordFn).not.toHaveBeenCalled();
+        });
+        it('records a slow render event when initialized', () => {
+            const config = makeFakeConfig({});
+            initializeMetricsModule(config);
+            recordSlowRenderModule(config, 123);
+            expect(mockHistogramRecordFn).toHaveBeenCalledWith(123, {
+                '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 +205,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,
             });
@@ -124,172 +224,139 @@ describe('Telemetry Metrics', () => {
             });
             expect(mockCounterAddFn).not.toHaveBeenCalled();
         });
-        it('should record token usage with the correct attributes', () => {
-            initializeMetricsModule(mockConfig);
-            recordTokenUsageMetricsModule(mockConfig, 100, {
-                model: 'gemini-pro',
-                type: 'input',
-            });
-            expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
-            expect(mockCounterAddFn).toHaveBeenNthCalledWith(1, 1, {
-                'session.id': 'test-session-id',
-            });
-            expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 100, {
-                'session.id': 'test-session-id',
-                model: 'gemini-pro',
-                type: 'input',
-            });
-        });
-        it('should record token usage for different types', () => {
+        it.each([
+            { type: 'input', tokens: 100, model: 'gemini-pro' },
+            { type: 'output', tokens: 50, model: 'gemini-pro' },
+            { type: 'thought', tokens: 25, model: 'gemini-pro' },
+            { type: 'cache', tokens: 75, model: 'gemini-pro' },
+            { type: 'tool', tokens: 125, model: 'gemini-pro' },
+            { type: 'input', tokens: 200, model: 'gemini-different-model' },
+        ])('should record token usage for $type type with $tokens tokens for model $model', ({ type, tokens, model }) => {
             initializeMetricsModule(mockConfig);
             mockCounterAddFn.mockClear();
-            recordTokenUsageMetricsModule(mockConfig, 50, {
-                model: 'gemini-pro',
-                type: 'output',
-            });
-            expect(mockCounterAddFn).toHaveBeenCalledWith(50, {
-                'session.id': 'test-session-id',
-                model: 'gemini-pro',
-                type: 'output',
-            });
-            recordTokenUsageMetricsModule(mockConfig, 25, {
-                model: 'gemini-pro',
-                type: 'thought',
+            recordTokenUsageMetricsModule(mockConfig, tokens, {
+                model,
+                type: type,
             });
-            expect(mockCounterAddFn).toHaveBeenCalledWith(25, {
+            expect(mockCounterAddFn).toHaveBeenCalledWith(tokens, {
                 'session.id': 'test-session-id',
-                model: 'gemini-pro',
-                type: 'thought',
-            });
-            recordTokenUsageMetricsModule(mockConfig, 75, {
-                model: 'gemini-pro',
-                type: 'cache',
-            });
-            expect(mockCounterAddFn).toHaveBeenCalledWith(75, {
-                'session.id': 'test-session-id',
-                model: 'gemini-pro',
-                type: 'cache',
-            });
-            recordTokenUsageMetricsModule(mockConfig, 125, {
-                model: 'gemini-pro',
-                type: 'tool',
-            });
-            expect(mockCounterAddFn).toHaveBeenCalledWith(125, {
-                'session.id': 'test-session-id',
-                model: 'gemini-pro',
-                type: 'tool',
-            });
-        });
-        it('should handle different models', () => {
-            initializeMetricsModule(mockConfig);
-            mockCounterAddFn.mockClear();
-            recordTokenUsageMetricsModule(mockConfig, 200, {
-                model: 'gemini-ultra',
-                type: 'input',
-            });
-            expect(mockCounterAddFn).toHaveBeenCalledWith(200, {
-                'session.id': 'test-session-id',
-                model: 'gemini-ultra',
-                type: 'input',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
+                model,
+                type,
             });
         });
     });
-    describe('recordFileOperationMetric', () => {
+    describe('recordLinesChanged metric', () => {
         const mockConfig = {
             getSessionId: () => 'test-session-id',
             getTelemetryEnabled: () => true,
         };
-        it('should not record metrics if not initialized', () => {
-            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, {
-                operation: FileOperation.CREATE,
-                lines: 10,
-                mimetype: 'text/plain',
-                extension: 'txt',
-            });
-            expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
-            expect(mockCounterAddFn).toHaveBeenNthCalledWith(1, 1, {
-                'session.id': 'test-session-id',
+        it('should not record lines added/removed if not initialized', () => {
+            recordLinesChangedModule(mockConfig, 10, 'added', {
+                function_name: 'fn',
             });
-            expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
-                'session.id': 'test-session-id',
-                operation: FileOperation.CREATE,
-                lines: 10,
-                mimetype: 'text/plain',
-                extension: 'txt',
-            });
-        });
-        it('should record file read with minimal attributes', () => {
-            initializeMetricsModule(mockConfig);
-            mockCounterAddFn.mockClear();
-            recordFileOperationMetricModule(mockConfig, {
-                operation: FileOperation.READ,
-            });
-            expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-                'session.id': 'test-session-id',
-                operation: FileOperation.READ,
-            });
-        });
-        it('should record file update with some attributes', () => {
-            initializeMetricsModule(mockConfig);
-            mockCounterAddFn.mockClear();
-            recordFileOperationMetricModule(mockConfig, {
-                operation: FileOperation.UPDATE,
-                mimetype: 'application/javascript',
-            });
-            expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-                'session.id': 'test-session-id',
-                operation: FileOperation.UPDATE,
-                mimetype: 'application/javascript',
+            recordLinesChangedModule(mockConfig, 5, 'removed', {
+                function_name: 'fn',
             });
+            expect(mockCounterAddFn).not.toHaveBeenCalled();
         });
-        it('should record file operation without diffStat', () => {
+        it('should record lines added with function_name after initialization', () => {
             initializeMetricsModule(mockConfig);
             mockCounterAddFn.mockClear();
-            recordFileOperationMetricModule(mockConfig, {
-                operation: FileOperation.UPDATE,
+            recordLinesChangedModule(mockConfig, 10, 'added', {
+                function_name: 'my-fn',
             });
-            expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
+            expect(mockCounterAddFn).toHaveBeenCalledWith(10, {
                 'session.id': 'test-session-id',
-                operation: FileOperation.UPDATE,
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
+                type: 'added',
+                function_name: 'my-fn',
             });
         });
-        it('should record minimal file operation when optional parameters are undefined', () => {
+        it('should record lines removed with function_name after initialization', () => {
             initializeMetricsModule(mockConfig);
             mockCounterAddFn.mockClear();
-            recordFileOperationMetricModule(mockConfig, {
-                operation: FileOperation.UPDATE,
-                lines: 10,
-                mimetype: 'text/plain',
-                extension: 'txt',
+            recordLinesChangedModule(mockConfig, 7, 'removed', {
+                function_name: 'my-fn',
             });
-            expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
+            expect(mockCounterAddFn).toHaveBeenCalledWith(7, {
                 'session.id': 'test-session-id',
-                operation: FileOperation.UPDATE,
-                lines: 10,
-                mimetype: 'text/plain',
-                extension: 'txt',
+                'installation.id': 'test-installation-id',
+                'user.email': 'test@example.com',
+                type: 'removed',
+                function_name: 'my-fn',
             });
         });
-        it('should not include diffStat attributes when diffStat is not provided', () => {
-            initializeMetricsModule(mockConfig);
-            mockCounterAddFn.mockClear();
-            recordFileOperationMetricModule(mockConfig, {
-                operation: FileOperation.UPDATE,
-            });
-            expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-                'session.id': 'test-session-id',
-                operation: FileOperation.UPDATE,
-            });
+    });
+    describe('recordFileOperationMetric', () => {
+        const mockConfig = {
+            getSessionId: () => 'test-session-id',
+            getTelemetryEnabled: () => true,
+        };
+        it.each([
+            {
+                name: 'should not record metrics if not initialized',
+                initialized: false,
+                attributes: {
+                    operation: FileOperation.CREATE,
+                    lines: 10,
+                    mimetype: 'text/plain',
+                    extension: 'txt',
+                },
+                shouldCall: false,
+            },
+            {
+                name: 'should record file creation with all attributes',
+                initialized: true,
+                attributes: {
+                    operation: FileOperation.CREATE,
+                    lines: 10,
+                    mimetype: 'text/plain',
+                    extension: 'txt',
+                },
+                shouldCall: true,
+            },
+            {
+                name: 'should record file read with minimal attributes',
+                initialized: true,
+                attributes: { operation: FileOperation.READ },
+                shouldCall: true,
+            },
+            {
+                name: 'should record file update with some attributes',
+                initialized: true,
+                attributes: {
+                    operation: FileOperation.UPDATE,
+                    mimetype: 'application/javascript',
+                },
+                shouldCall: true,
+            },
+            {
+                name: 'should record file update with no optional attributes',
+                initialized: true,
+                attributes: { operation: FileOperation.UPDATE },
+                shouldCall: true,
+            },
+        ])('$name', ({ initialized, attributes, shouldCall }) => {
+            if (initialized) {
+                initializeMetricsModule(mockConfig);
+                // The session start event also calls the counter.
+                mockCounterAddFn.mockClear();
+            }
+            recordFileOperationMetricModule(mockConfig, attributes);
+            if (shouldCall) {
+                expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
+                    'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
+                    ...attributes,
+                });
+            }
+            else {
+                expect(mockCounterAddFn).not.toHaveBeenCalled();
+            }
         });
     });
     describe('recordModelRoutingMetrics', () => {
@@ -309,6 +376,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',
             });
@@ -321,17 +390,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',
@@ -367,6 +645,8 @@ describe('Telemetry Metrics', () => {
                 });
                 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,
@@ -379,6 +659,8 @@ describe('Telemetry Metrics', () => {
                 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',
                 });
             });
@@ -396,6 +678,8 @@ describe('Telemetry Metrics', () => {
                 });
                 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,
@@ -403,61 +687,49 @@ describe('Telemetry Metrics', () => {
             });
         });
         describe('recordMemoryUsage', () => {
-            it('should record memory usage for different memory types', () => {
-                initializeMetricsModule(mockConfig);
-                mockHistogramRecordFn.mockClear();
-                recordMemoryUsageModule(mockConfig, 15728640, {
+            it.each([
+                {
                     memory_type: MemoryMetricType.HEAP_USED,
                     component: 'startup',
-                });
-                expect(mockHistogramRecordFn).toHaveBeenCalledWith(15728640, {
-                    'session.id': 'test-session-id',
-                    memory_type: 'heap_used',
-                    component: 'startup',
-                });
-            });
-            it('should record memory usage for all memory metric types', () => {
-                initializeMetricsModule(mockConfig);
-                mockHistogramRecordFn.mockClear();
-                recordMemoryUsageModule(mockConfig, 31457280, {
+                    value: 15728640,
+                },
+                {
                     memory_type: MemoryMetricType.HEAP_TOTAL,
                     component: 'api_call',
-                });
-                recordMemoryUsageModule(mockConfig, 2097152, {
+                    value: 31457280,
+                },
+                {
                     memory_type: MemoryMetricType.EXTERNAL,
                     component: 'tool_execution',
-                });
-                recordMemoryUsageModule(mockConfig, 41943040, {
+                    value: 2097152,
+                },
+                {
                     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',
-                    memory_type: 'heap_total',
-                    component: 'api_call',
-                });
-                expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(2, 2097152, {
-                    'session.id': 'test-session-id',
-                    memory_type: 'external',
-                    component: 'tool_execution',
-                });
-                expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(3, 41943040, {
-                    'session.id': 'test-session-id',
-                    memory_type: 'rss',
-                    component: 'memory_monitor',
-                });
-            });
-            it('should record memory usage without component', () => {
+                    value: 41943040,
+                },
+                {
+                    memory_type: MemoryMetricType.HEAP_USED,
+                    component: undefined,
+                    value: 15728640,
+                },
+            ])('should record memory usage for $memory_type', ({ memory_type, component, value }) => {
                 initializeMetricsModule(mockConfig);
                 mockHistogramRecordFn.mockClear();
-                recordMemoryUsageModule(mockConfig, 15728640, {
-                    memory_type: MemoryMetricType.HEAP_USED,
+                recordMemoryUsageModule(mockConfig, value, {
+                    memory_type,
+                    component,
                 });
-                expect(mockHistogramRecordFn).toHaveBeenCalledWith(15728640, {
+                const expectedAttributes = {
                     'session.id': 'test-session-id',
-                    memory_type: 'heap_used',
-                });
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
+                    memory_type,
+                };
+                if (component) {
+                    expectedAttributes['component'] = component;
+                }
+                expect(mockHistogramRecordFn).toHaveBeenCalledWith(value, expectedAttributes);
             });
         });
         describe('recordCpuUsage', () => {
@@ -469,6 +741,8 @@ describe('Telemetry Metrics', () => {
                 });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(85.5, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     component: 'tool_execution',
                 });
             });
@@ -478,6 +752,8 @@ describe('Telemetry Metrics', () => {
                 recordCpuUsageModule(mockConfig, 42.3, {});
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(42.3, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                 });
             });
         });
@@ -488,6 +764,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', () => {
@@ -496,6 +774,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',
                 });
             });
         });
@@ -509,6 +789,8 @@ describe('Telemetry Metrics', () => {
                 });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(25, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     function_name: 'Read',
                     phase: 'validation',
                 });
@@ -531,16 +813,22 @@ describe('Telemetry Metrics', () => {
                 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',
                 });
@@ -557,6 +845,8 @@ describe('Telemetry Metrics', () => {
                 });
                 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',
@@ -571,6 +861,8 @@ describe('Telemetry Metrics', () => {
                 });
                 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',
                 });
@@ -586,6 +878,8 @@ describe('Telemetry Metrics', () => {
                 });
                 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',
                 });
@@ -608,16 +902,22 @@ describe('Telemetry Metrics', () => {
                 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',
                 });
@@ -633,6 +933,8 @@ describe('Telemetry Metrics', () => {
                 });
                 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,
                 });
@@ -645,6 +947,8 @@ describe('Telemetry Metrics', () => {
                 });
                 expect(mockHistogramRecordFn).toHaveBeenCalledWith(92.3, {
                     'session.id': 'test-session-id',
+                    'installation.id': 'test-installation-id',
+                    'user.email': 'test@example.com',
                     category: 'overall_performance',
                 });
             });
@@ -663,6 +967,8 @@ describe('Telemetry Metrics', () => {
                 // 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,
@@ -671,6 +977,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,
@@ -690,6 +998,8 @@ describe('Telemetry Metrics', () => {
                 // 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,
@@ -715,6 +1025,8 @@ describe('Telemetry Metrics', () => {
                 });
                 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,
@@ -722,6 +1034,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,
@@ -742,6 +1056,8 @@ describe('Telemetry Metrics', () => {
                 // 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,
@@ -760,6 +1076,8 @@ describe('Telemetry Metrics', () => {
                 // 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,