Add log_id to EAS logs

CHANGELOG.md

@@ -9,13 +9,11 @@ This is the log of notable changes to EAS CLI and related packages.
 - Drop support for Node 18 and Node 19. Require Node 20+. ([#3343](https://github.com/expo/eas-cli/pull/3343) by [@sjchmiela](https://github.com/sjchmiela))
 
 ### 🎉 New features
-
-
-- Hide progress bar in build credits warning when usage reaches 100%. ([#3371](https://github.com/expo/eas-cli/pull/3371) by [@mackenco](https://github.com/mackenco))
+- Add `--browser` flag to `eas login` for browser-based authentication. ([#3312](https://github.com/expo/eas-cli/pull/3312) by [@byronkarlen](https://github.com/byronkarlen))
 
 ### 🐛 Bug fixes
 
-- Fix `--non-interactive` mode prompting for git initialization. Now auto-initializes git with an initial commit when needed. Set `EAS_NO_VCS=1` to skip. ([#3387](https://github.com/expo/eas-cli/pull/3387) by [@evanbacon](https://github.com/evanbacon))
+- Hide progress bar in build credits warning when usage reaches 100%. ([#3371](https://github.com/expo/eas-cli/pull/3371) by [@mackenco](https://github.com/mackenco))
 
 ### 🧹 Chores
 
@@ -25,7 +23,6 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-- Add `--browser` flag to `eas login` for browser-based authentication. ([#3312](https://github.com/expo/eas-cli/pull/3312) by [@byronkarlen](https://github.com/byronkarlen))
 - List available options in non-interactive mode errors instead of generic "unable to select" messages, making CLI usable by agents and scripts. ([#3359](https://github.com/expo/eas-cli/pull/3359) by [@EvanBacon](https://github.com/EvanBacon))
 - Hidden beta version of new `eas account:usage` command for viewing account usage and billing estimates. ([#3334](https://github.com/expo/eas-cli/pull/3334) by [@douglowder](https://github.com/douglowder), [@EvanBacon](https://github.com/EvanBacon))
 - Add `--no-bytecode` and `--source-maps [mode]` flags to `eas update`. ([#3339](https://github.com/expo/eas-cli/pull/3339) by [@brentvatne](https://github.com/brentvatne))

packages/eas-cli/src/build/runBuildAndSubmit.ts

@@ -128,7 +128,7 @@ export async function runBuildAndSubmitAsync({
   buildIds: string[];
   buildProfiles?: ProfileData<'build'>[];
 }> {
-  await vcsClient.ensureRepoExistsAsync({ nonInteractive: flags.nonInteractive });
+  await vcsClient.ensureRepoExistsAsync();
   await ensureRepoIsCleanAsync(vcsClient, flags.nonInteractive);
 
   await ensureProjectConfiguredAsync({

packages/eas-cli/src/commands/build/configure.ts

@@ -46,7 +46,9 @@ export default class BuildConfigure extends EasCommand {
       '💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.'
     );
 
-    await vcsClient.ensureRepoExistsAsync({ nonInteractive: false });
+    // BuildConfigure.ContextOptions.Vcs.client.getValueAsync()
+
+    await vcsClient.ensureRepoExistsAsync();
 
     const expoUpdatesIsInstalled = isExpoUpdatesInstalled(projectDir);
 

packages/eas-cli/src/commands/build/dev.ts

@@ -74,8 +74,8 @@ export default class BuildDev extends EasCommand {
       Errors.error('Running iOS builds in simulator is only supported on macOS.', { exit: 1 });
     }
 
-    await vcsClient.ensureRepoExistsAsync({ nonInteractive: false });
-    await ensureRepoIsCleanAsync(vcsClient, false);
+    await vcsClient.ensureRepoExistsAsync();
+    await ensureRepoIsCleanAsync(vcsClient, flags.nonInteractive);
     await ensureProjectConfiguredAsync({
       projectDir,
       nonInteractive: false,

packages/eas-cli/src/commands/build/inspect.ts

@@ -94,7 +94,7 @@ export default class BuildInspect extends EasCommand {
     await this.prepareOutputDirAsync(outputDirectory, flags.force);
 
     if (flags.stage === InspectStage.ARCHIVE) {
-      await vcsClient.ensureRepoExistsAsync({ nonInteractive: false });
+      await vcsClient.ensureRepoExistsAsync();
       await vcsClient.makeShallowCopyAsync(tmpWorkingdir);
       await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
     } else {

packages/eas-cli/src/commands/update/configure.ts

@@ -46,7 +46,7 @@ export default class UpdateConfigure extends EasCommand {
       '💡 The following process will configure your project to use EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
     );
 
-    await vcsClient.ensureRepoExistsAsync({ nonInteractive: flags['non-interactive'] });
+    await vcsClient.ensureRepoExistsAsync();
 
     const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
     const easJsonCliConfig: EasJson['cli'] =

packages/eas-cli/src/commands/update/index.ts

@@ -240,7 +240,7 @@ export default class UpdatePublish extends EasCommand {
       enableJsonOutput();
     }
 
-    await vcsClient.ensureRepoExistsAsync({ nonInteractive });
+    await vcsClient.ensureRepoExistsAsync();
     await ensureRepoIsCleanAsync(vcsClient, nonInteractive);
 
     const {

packages/eas-cli/src/vcs/clients/git.ts

@@ -31,11 +31,7 @@ export default class GitClient extends Client {
     this.requireCommit = options.requireCommit;
   }
 
-  public override async ensureRepoExistsAsync(options?: {
-    nonInteractive?: boolean;
-  }): Promise<void> {
-    const nonInteractive = options?.nonInteractive ?? false;
-
+  public override async ensureRepoExistsAsync(): Promise<void> {
     try {
       if (!(await isGitInstalledAsync())) {
         Log.error(
@@ -70,26 +66,11 @@ export default class GitClient extends Client {
       return;
     }
 
-    const cwd = process.cwd();
-    const repoRoot = PackageManagerUtils.resolveWorkspaceRoot(cwd) ?? cwd;
-
-    if (nonInteractive) {
-      Log.log(
-        `No git repository found. Auto initializing in ${this.maybeCwdOverride ?? repoRoot}. ` +
-          `Set ${chalk.bold('EAS_NO_VCS=1')} to skip.`
-      );
-      await spawnAsync('git', ['init'], { cwd: this.maybeCwdOverride ?? repoRoot });
-      await this.commitAsync({
-        commitAllFiles: true,
-        commitMessage: 'Initial commit',
-        nonInteractive: true,
-      });
-      return;
-    }
-
     Log.warn("It looks like you haven't initialized the git repository yet.");
     Log.warn('EAS requires you to use a git repository for your project.');
 
+    const cwd = process.cwd();
+    const repoRoot = PackageManagerUtils.resolveWorkspaceRoot(cwd) ?? cwd;
     const confirmInit = await confirmAsync({
       message: `Would you like us to run 'git init' in ${
         this.maybeCwdOverride ?? repoRoot
@@ -438,22 +419,16 @@ export default class GitClient extends Client {
       return;
     }
 
-    const missingConfig = [
-      !usernameConfigured && 'username (user.name)',
-      !emailConfigured && 'email address (user.email)',
-    ].filter(i => i);
-
-    Log.warn(`You need to configure Git with your ${missingConfig.join(' and ')}`);
-    if (nonInteractive) {
-      const configCommands = [
-        !usernameConfigured && 'git config --global user.name "Your Name"',
-        !emailConfigured && 'git config --global user.email "[email protected]"',
+    Log.warn(
+      `You need to configure Git with your ${[
+        !usernameConfigured && 'username (user.name)',
+        !emailConfigured && 'email address (user.email)',
       ]
         .filter(i => i)
-        .join(' && ');
-      throw new Error(
-        `Git ${missingConfig.join(' and ')} must be configured. Run: ${configCommands}`
-      );
+        .join(' and ')}`
+    );
+    if (nonInteractive) {
+      throw new Error('Git cannot be configured automatically in non-interactive mode');
     }
     if (!usernameConfigured) {
       const { username } = await promptAsync({

packages/eas-cli/src/vcs/vcs.ts

@@ -14,7 +14,7 @@ export abstract class Client {
 
   // (optional) ensureRepoExistsAsync should verify whether repository exists and tooling is installed
   // it's not required for minimal support, but lack of validation might cause the failure at a later stage.
-  public async ensureRepoExistsAsync(_options?: { nonInteractive?: boolean }): Promise<void> {}
+  public async ensureRepoExistsAsync(): Promise<void> {}
 
   // (optional) checks whether commit is necessary before calling makeShallowCopyAsync
   //

packages/worker/package.json

@@ -52,6 +52,7 @@
     "semver": "7.6.3",
     "tar": "7.5.7",
     "uuid": "3.4.0",
+    "uuidv7": "1.1.0",
     "ws": "8.18.0",
     "xml2js": "0.6.2",
     "zod": "4.1.8"

packages/worker/src/logger.ts

@@ -2,6 +2,7 @@ import { LogBuffer } from '@expo/build-tools';
 import { EnvironmentSecret } from '@expo/eas-build-job';
 import { LoggerLevel, createLogger } from '@expo/logger';
 import { Transform, TransformCallback, Writable } from 'stream';
+import { uuidv7 } from 'uuidv7';
 
 import config from './config';
 import { maybeStringBase64Decode, simpleSecretsWhitelist } from './secrets';
@@ -14,6 +15,10 @@ export interface BuildLogger extends CommonBuildLogger {
 const defaultLogger = createLogger({
   name: config.loggers.base.name,
   level: LoggerLevel.INFO,
+  log_id: true,
+  serializers: {
+    log_id: () => uuidv7(),
+  },
 });
 
 const MAX_LINES_IN_BUFFER = 100;

yarn.lock

@@ -17217,6 +17217,11 @@ uuid@^8.0.0, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+[email protected]:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/uuidv7/-/uuidv7-1.1.0.tgz#6ef58df2dd7377083de1f70eec29cb66a0baf30c"
+  integrity sha512-2VNnOC0+XQlwogChUDzy6pe8GQEys9QFZBGOh54l6qVfwoCUwwRvk7rDTgaIsRgsF5GFa5oiNg8LqXE3jofBBg==
+
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"