Introduce ContentGeneratorConfig (#826)

2 files changed, 2 insertions, 2 deletions

diff --git a/packages/core/src/telemetry/loggers.ts b/packages/core/src/telemetry/loggers.ts
index ccab12ff..e8a6156c 100644
--- a/packages/core/src/telemetry/loggers.ts
+++ b/packages/core/src/telemetry/loggers.ts
@@ -45,7 +45,7 @@ export function logCliConfiguration(config: Config): void {
       typeof config.getSandbox() === 'string' ? true : config.getSandbox(),
     core_tools_enabled: (config.getCoreTools() ?? []).join(','),
     approval_mode: config.getApprovalMode(),
-    vertex_ai_enabled: config.getVertexAI() ?? false,
+    vertex_ai_enabled: !!config.getContentGeneratorConfig().vertexai,
     log_user_prompts_enabled: config.getTelemetryLogUserPromptsEnabled(),
     file_filtering_respect_git_ignore:
       config.getFileFilteringRespectGitIgnore(),
diff --git a/packages/core/src/telemetry/sdk.ts b/packages/core/src/telemetry/sdk.ts
index b55cb149..ad5a9c44 100644
--- a/packages/core/src/telemetry/sdk.ts
+++ b/packages/core/src/telemetry/sdk.ts
@@ -64,7 +64,7 @@ export function initializeTelemetry(config: Config): void {
     return;
   }
 
-  const geminiCliVersion = config.getUserAgent() || 'unknown';
+  const geminiCliVersion = config.getContentGeneratorConfig().userAgent;
   const resource = new Resource({
     [SemanticResourceAttributes.SERVICE_NAME]: SERVICE_NAME,
     [SemanticResourceAttributes.SERVICE_VERSION]: geminiCliVersion,