Moved client id logging into createBasicLogEvent (#13607)

Author: owenofbrien

packages/core/src/telemetry/clearcut-logger/clearcut-logger.ts

@@ -292,8 +292,10 @@ export class ClearcutLogger {
     eventName: EventNames,
     data: EventValue[] = [],
   ): LogEvent {
+    const email = this.userAccountManager.getCachedGoogleAccount();
     const surface = determineSurface();
     const ghWorkflowName = determineGHWorkflowName();
+
     const baseMetadata: EventValue[] = [
       ...data,
       {
@@ -321,34 +323,32 @@ export class ClearcutLogger {
       });
     }
 
-    return {
+    const logEvent: LogEvent = {
       console_type: 'GEMINI_CLI',
       application: 102, // GEMINI_CLI
       event_name: eventName as string,
       event_metadata: [baseMetadata],
     };
+
+    // Should log either email or install ID, not both. See go/cloudmill-1p-oss-instrumentation#define-sessionable-id
+    if (email) {
+      logEvent.client_email = email;
+    } else {
+      logEvent.client_install_id = this.installationManager.getInstallationId();
+    }
+
+    return logEvent;
   }
 
   createLogEvent(eventName: EventNames, data: EventValue[] = []): LogEvent {
-    const email = this.userAccountManager.getCachedGoogleAccount();
-
     if (eventName !== EventNames.START_SESSION) {
       data.push(...this.sessionData);
     }
     const totalAccounts = this.userAccountManager.getLifetimeGoogleAccounts();
 
     data = this.addDefaultFields(data, totalAccounts);
 
-    const logEvent = this.createBasicLogEvent(eventName, data);
-
-    // Should log either email or install ID, not both. See go/cloudmill-1p-oss-instrumentation#define-sessionable-id
-    if (email) {
-      logEvent.client_email = email;
-    } else {
-      logEvent.client_install_id = this.installationManager.getInstallationId();
-    }
-
-    return logEvent;
+    return this.createBasicLogEvent(eventName, data);
   }
 
   flushIfNeeded(): void {