diff options
Diffstat (limited to 'packages/core/src/telemetry')
| -rw-r--r-- | packages/core/src/telemetry/loggers.test.ts | 6 | ||||
| -rw-r--r-- | packages/core/src/telemetry/loggers.ts | 14 | ||||
| -rw-r--r-- | packages/core/src/telemetry/telemetry.test.ts | 4 |
3 files changed, 14 insertions, 10 deletions
diff --git a/packages/core/src/telemetry/loggers.test.ts b/packages/core/src/telemetry/loggers.test.ts index 6ec73853..5b1cb707 100644 --- a/packages/core/src/telemetry/loggers.test.ts +++ b/packages/core/src/telemetry/loggers.test.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ToolConfirmationOutcome } from '../index.js'; +import { AuthType, ToolConfirmationOutcome } from '../index.js'; import { logs } from '@opentelemetry/api-logs'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { Config } from '../config/config.js'; @@ -57,8 +57,7 @@ describe('loggers', () => { getContentGeneratorConfig: () => ({ model: 'test-model', apiKey: 'test-api-key', - vertexai: true, - codeAssist: false, + authType: AuthType.USE_VERTEX_AI, }), getTelemetryLogPromptsEnabled: () => true, getFileFilteringRespectGitIgnore: () => true, @@ -86,7 +85,6 @@ describe('loggers', () => { approval_mode: 'default', api_key_enabled: true, vertex_ai_enabled: true, - code_assist_enabled: false, log_user_prompts_enabled: true, file_filtering_respect_git_ignore: true, debug_mode: true, diff --git a/packages/core/src/telemetry/loggers.ts b/packages/core/src/telemetry/loggers.ts index 985e291c..76b91f7b 100644 --- a/packages/core/src/telemetry/loggers.ts +++ b/packages/core/src/telemetry/loggers.ts @@ -35,6 +35,7 @@ import { GenerateContentResponse, GenerateContentResponseUsageMetadata, } from '@google/genai'; +import { AuthType } from '../core/contentGenerator.js'; const shouldLogUserPrompts = (config: Config): boolean => config.getTelemetryLogPromptsEnabled() ?? false; @@ -72,6 +73,14 @@ export function logCliConfiguration(config: Config): void { if (!isTelemetrySdkInitialized()) return; const generatorConfig = config.getContentGeneratorConfig(); + let useGemini = false; + let useVertex = false; + + if (generatorConfig && generatorConfig.authType) { + useGemini = generatorConfig.authType === AuthType.USE_GEMINI; + useVertex = generatorConfig.authType === AuthType.USE_VERTEX_AI; + } + const mcpServers = config.getMcpServers(); const attributes: LogAttributes = { ...getCommonAttributes(config), @@ -82,9 +91,8 @@ export function logCliConfiguration(config: Config): void { sandbox_enabled: !!config.getSandbox(), core_tools_enabled: (config.getCoreTools() ?? []).join(','), approval_mode: config.getApprovalMode(), - api_key_enabled: !!generatorConfig.apiKey, - vertex_ai_enabled: !!generatorConfig.vertexai, - code_assist_enabled: !!generatorConfig.codeAssist, + api_key_enabled: useGemini || useVertex, + vertex_ai_enabled: useVertex, log_user_prompts_enabled: config.getTelemetryLogPromptsEnabled(), file_filtering_respect_git_ignore: config.getFileFilteringRespectGitIgnore(), diff --git a/packages/core/src/telemetry/telemetry.test.ts b/packages/core/src/telemetry/telemetry.test.ts index 7cd6f95f..97c96c64 100644 --- a/packages/core/src/telemetry/telemetry.test.ts +++ b/packages/core/src/telemetry/telemetry.test.ts @@ -27,9 +27,7 @@ describe('telemetry', () => { mockConfig = new Config({ sessionId: 'test-session-id', - contentGeneratorConfig: { - model: 'test-model', - }, + model: 'test-model', targetDir: '/test/dir', debugMode: false, cwd: '/test/dir', |
