Remove the number of actions from the build completed message when the new stats summary is enabled.

The new stats summary already shows the number of actions, so it's redundant to include it in the build completed message.

This has no effect unless `--experimental_stats_summary` is passed.

PiperOrigin-RevId: 671754216
Change-Id: Ib78988670ef226723a80425be50dfd870eb8035f

Author: meisterT

src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java

@@ -487,7 +487,11 @@ private BlazeCommandResult execExclusively(
 
         DebugLoggerConfigurator.setupLogging(commonOptions.verbosity);
 
-        EventHandler handler = createEventHandler(outErr, eventHandlerOptions, env);
+        boolean newStatsSummary =
+            options.getOptions(ExecutionOptions.class) != null
+                && options.getOptions(ExecutionOptions.class).statsSummary;
+        EventHandler handler =
+            createEventHandler(outErr, eventHandlerOptions, env, newStatsSummary);
         reporter.addHandler(handler);
         env.getEventBus().register(handler);
 
@@ -497,7 +501,7 @@ private BlazeCommandResult execExclusively(
         // modified.
         if (!eventHandlerOptions.useColor()) {
           UiEventHandler ansiAllowingHandler =
-              createEventHandler(colorfulOutErr, eventHandlerOptions, env);
+              createEventHandler(colorfulOutErr, eventHandlerOptions, env, newStatsSummary);
           reporter.registerAnsiAllowingHandler(handler, ansiAllowingHandler);
           env.getEventBus().register(new PassiveExperimentalEventHandler(ansiAllowingHandler));
         }
@@ -867,7 +871,7 @@ private OptionsParser createOptionsParser(BlazeCommand command)
 
   /** Returns the event handler to use for this Blaze command. */
   private UiEventHandler createEventHandler(
-      OutErr outErr, UiOptions eventOptions, CommandEnvironment env) {
+      OutErr outErr, UiOptions eventOptions, CommandEnvironment env, boolean newStatsSummary) {
     Path workspacePath = runtime.getWorkspace().getDirectories().getWorkspace();
     PathFragment workspacePathFragment = workspacePath == null ? null : workspacePath.asFragment();
     return new UiEventHandler(
@@ -876,7 +880,8 @@ private UiEventHandler createEventHandler(
         runtime.getClock(),
         env.getEventBus(),
         workspacePathFragment,
-        env.withMergedAnalysisAndExecutionSourceOfTruth());
+        env.withMergedAnalysisAndExecutionSourceOfTruth(),
+        newStatsSummary);
   }
 
   /** Returns the runtime instance shared by the commands that this dispatcher dispatches to. */

src/main/java/com/google/devtools/build/lib/runtime/UiEventHandler.java

@@ -166,7 +166,8 @@ public UiEventHandler(
       Clock clock,
       EventBus eventBus,
       @Nullable PathFragment workspacePathFragment,
-      boolean skymeldMode) {
+      boolean skymeldMode,
+      boolean newStatsSummary) {
     this.terminalWidth = (options.terminalColumns > 0 ? options.terminalColumns : 80);
     this.maxStdoutErrBytes = options.maxStdoutErrBytes;
     this.outErr =
@@ -202,6 +203,7 @@ public UiEventHandler(
               : new UiStateTracker(clock);
     }
     this.stateTracker.setProgressSampleSize(options.uiActionsShown);
+    this.stateTracker.setNewStatsSummary(newStatsSummary);
     this.numLinesProgressBar = 0;
     if (this.cursorControl) {
       this.progressRateLimitMillis = Math.round(options.showProgressRateLimit * 1000);

src/main/java/com/google/devtools/build/lib/runtime/UiStateTracker.java

@@ -99,6 +99,8 @@ class UiStateTracker {
 
   private int sampleSize = 3;
 
+  private boolean newStatsSummary = false;
+
   protected String status;
   protected String additionalMessage = "";
   // Not null after the loading phase has completed.
@@ -412,6 +414,10 @@ void setProgressSampleSize(int sampleSize) {
     this.sampleSize = Math.max(1, sampleSize);
   }
 
+  void setNewStatsSummary(boolean newStatsSummary) {
+    this.newStatsSummary = newStatsSummary;
+  }
+
   void mainRepoMappingComputationStarted() {
     status = "Computing main repo mapping";
     additionalMessage = "";
@@ -478,20 +484,23 @@ Event buildComplete(BuildCompleteEvent event) {
     additionalMessage = "";
     if (event.getResult().getSuccess()) {
       int actionsCompleted = this.actionsCompleted.get();
+      StringBuilder completedStringBuilder = new StringBuilder().append("Build completed");
       if (failedTests == 0) {
-        return Event.info(
-            "Build completed successfully, "
-                + actionsCompleted
-                + pluralize(" total action", actionsCompleted));
+        completedStringBuilder.append(" successfully");
       } else {
-        return Event.info(
-            "Build completed, "
-                + failedTests
-                + pluralize(" test", failedTests)
-                + " FAILED, "
-                + actionsCompleted
-                + pluralize(" total action", actionsCompleted));
+        completedStringBuilder
+            .append(", ")
+            .append(failedTests)
+            .append(pluralize(" test", failedTests))
+            .append(" FAILED");
+      }
+      if (!newStatsSummary) {
+        completedStringBuilder
+            .append(", ")
+            .append(actionsCompleted)
+            .append(pluralize(" total action", actionsCompleted));
       }
+      return Event.info(completedStringBuilder.toString());
     } else {
       ok = false;
       return Event.error("Build did NOT complete successfully");

src/test/java/com/google/devtools/build/lib/runtime/UiEventHandlerStdOutAndStdErrTest.java

@@ -92,7 +92,8 @@ private void createUiEventHandler(UiOptions uiOptions) {
             new ManualClock(),
             new EventBus(),
             /* workspacePathFragment= */ null,
-            /* skymeldMode= */ skymeldMode);
+            /* skymeldMode= */ skymeldMode,
+            /* newStatsSummary= */ false);
     uiEventHandler.mainRepoMappingComputationStarted(new MainRepoMappingComputationStartingEvent());
     uiEventHandler.buildStarted(
         BuildStartingEvent.create(