Delete experimental_ui_mode

Skimming the internet and available internal data sources, it doesn't look like
it caught on. While it does seem kind of cool/useful, it's also nice to have
less knobs to understand/keep in sync/etc.

PiperOrigin-RevId: 398540135

Author: michajlo

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

@@ -188,7 +188,7 @@ public UiEventHandler(
         this.cursorControl
             ? new UiStateTracker(clock, this.terminalWidth - 2)
             : new UiStateTracker(clock);
-    this.stateTracker.setProgressMode(options.uiProgressMode, options.uiSamplesShown);
+    this.stateTracker.setProgressSampleSize(options.uiActionsShown);
     this.numLinesProgressBar = 0;
     if (this.cursorControl) {
       this.minimalDelayMillis = Math.round(options.showProgressRateLimit * 1000);

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

@@ -14,7 +14,6 @@
 package com.google.devtools.build.lib.runtime;
 
 import com.google.devtools.build.lib.events.EventKind;
-import com.google.devtools.build.lib.runtime.UiStateTracker.ProgressMode;
 import com.google.devtools.common.options.Converter;
 import com.google.devtools.common.options.Converters.CommaSeparatedOptionListConverter;
 import com.google.devtools.common.options.Converters.RangeConverter;
@@ -113,13 +112,6 @@ public UseCursesConverter() {
     }
   }
 
-  /** Progress mode converter. */
-  public static class ProgressModeConverter extends EnumConverter<ProgressMode> {
-    public ProgressModeConverter() {
-      super(ProgressMode.class, "--experimental_ui_mode setting");
-    }
-  }
-
   @Option(
       name = "show_progress",
       defaultValue = "true",
@@ -250,19 +242,6 @@ public ProgressModeConverter() {
       allowMultiple = true)
   public List<EventKind> eventFilters;
 
-  @Option(
-      name = "experimental_ui_mode",
-      defaultValue = "oldest_actions",
-      converter = ProgressModeConverter.class,
-      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-      effectTags = {OptionEffectTag.TERMINAL_OUTPUT},
-      help =
-          "Determines what kind of data is shown in the detailed progress bar. By default, it is "
-              + "set to show the oldest actions and their running time. The underlying data "
-              + "source is usually sampled in a mode-dependend way to fit within the number of "
-              + "lines given by --ui_actions_shown.")
-  public ProgressMode uiProgressMode;
-
   @Option(
       name = "ui_actions_shown",
       oldName = "experimental_ui_actions_shown",
@@ -272,9 +251,8 @@ public ProgressModeConverter() {
       help =
           "Number of concurrent actions shown in the detailed progress bar; each "
               + "action is shown on a separate line. The progress bar always shows "
-              + "at least one one, all numbers less than 1 are mapped to 1. "
-              + "This option has no effect if --noui is set.")
-  public int uiSamplesShown;
+              + "at least one one, all numbers less than 1 are mapped to 1.")
+  public int uiActionsShown;
 
   @Option(
       name = "experimental_ui_max_stdouterr_bytes",

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

@@ -16,10 +16,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Comparators;
-import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Multiset;
 import com.google.common.collect.Sets;
 import com.google.devtools.build.lib.actions.Action;
 import com.google.devtools.build.lib.actions.ActionCompletionEvent;
@@ -63,7 +60,6 @@
 import java.util.Deque;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.PriorityQueue;
@@ -78,11 +74,6 @@
 /** Tracks state for the UI. */
 final class UiStateTracker {
 
-  enum ProgressMode {
-    OLDEST_ACTIONS,
-    MNEMONIC_HISTOGRAM
-  }
-
   private static final long SHOW_TIME_THRESHOLD_SECONDS = 3;
   private static final String ELLIPSIS = "...";
   private static final String FETCH_PREFIX = "    Fetching ";
@@ -93,7 +84,6 @@ enum ProgressMode {
   private static final int NANOS_PER_SECOND = 1000000000;
   private static final String URL_PROTOCOL_SEP = "://";
 
-  private ProgressMode progressMode = ProgressMode.OLDEST_ACTIONS;
   private int sampleSize = 3;
 
   private String status;
@@ -416,9 +406,8 @@ synchronized String describe() {
     this(clock, 0);
   }
 
-  /** Set the progress bar mode and sample size. */
-  void setProgressMode(ProgressMode progressMode, int sampleSize) {
-    this.progressMode = progressMode;
+  /** Set the progress bar sample size. */
+  void setProgressSampleSize(int sampleSize) {
     this.sampleSize = Math.max(1, sampleSize);
   }
 
@@ -906,29 +895,7 @@ private String countActions() {
   }
 
   private void printActionState(AnsiTerminalWriter terminalWriter) throws IOException {
-    switch (progressMode) {
-      case OLDEST_ACTIONS:
-        sampleOldestActions(terminalWriter);
-        break;
-      case MNEMONIC_HISTOGRAM:
-        showMnemonicHistogram(terminalWriter);
-        break;
-    }
-  }
-
-  private void showMnemonicHistogram(AnsiTerminalWriter terminalWriter) throws IOException {
-    Multiset<String> mnemonicHistogram = HashMultiset.create();
-    for (Map.Entry<Artifact, ActionState> action : activeActions.entrySet()) {
-      mnemonicHistogram.add(action.getValue().action.getMnemonic());
-    }
-    List<Multiset.Entry<String>> sorted =
-        mnemonicHistogram.entrySet().stream()
-            .collect(
-                Comparators.greatest(
-                    sampleSize, Comparator.comparingLong(Multiset.Entry::getCount)));
-    for (Multiset.Entry<String> entry : sorted) {
-      terminalWriter.newline().append("    " + entry.getElement() + " " + entry.getCount());
-    }
+    sampleOldestActions(terminalWriter);
   }
 
   private void sampleOldestActions(AnsiTerminalWriter terminalWriter) throws IOException {

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

@@ -51,7 +51,6 @@
 import com.google.devtools.build.lib.buildtool.buildevent.TestFilteringCompleteEvent;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.events.ExtendedEventHandler.FetchProgress;
-import com.google.devtools.build.lib.runtime.UiStateTracker.ProgressMode;
 import com.google.devtools.build.lib.runtime.UiStateTracker.StrategyIds;
 import com.google.devtools.build.lib.skyframe.LoadingPhaseStartedEvent;
 import com.google.devtools.build.lib.skyframe.PackageProgressReceiver;
@@ -334,7 +333,7 @@ public void testSampleSize() throws IOException {
 
     // For various sample sizes verify the progress bar
     for (int i = 1; i < 11; i++) {
-      stateTracker.setProgressMode(ProgressMode.OLDEST_ACTIONS, i);
+      stateTracker.setProgressSampleSize(i);
       LoggingTerminalWriter terminalWriter = new LoggingTerminalWriter(/*discardHighlight=*/ true);
       stateTracker.writeProgressBar(terminalWriter);
       String output = terminalWriter.getTranscript();
@@ -1355,43 +1354,6 @@ public void testTotalFetchesReported() throws IOException {
     assertThat(output, containsString("30 fetches"));
   }
 
-  private Action mockActionWithMnemonic(String mnemonic, String primaryOutput) {
-    Path path = outputBase.getRelative(PathFragment.create(primaryOutput));
-    Artifact artifact =
-        ActionsTestUtil.createArtifact(ArtifactRoot.asSourceRoot(Root.fromPath(outputBase)), path);
-    Action action = mock(Action.class);
-    when(action.getMnemonic()).thenReturn(mnemonic);
-    when(action.getPrimaryOutput()).thenReturn(artifact);
-    return action;
-  }
-
-  @Test
-  public void testMnemonicHistogram() throws IOException {
-    // Verify that the number of actions shown in the progress bar can be set as sample size.
-    ManualClock clock = new ManualClock();
-    clock.advanceMillis(Duration.ofSeconds(123).toMillis());
-    UiStateTracker stateTracker = new UiStateTracker(clock);
-    clock.advanceMillis(Duration.ofSeconds(2).toMillis());
-
-    // Start actions with 10 different mnemonics Mnemonic0-9, n+1 of each mnemonic.
-    for (int i = 0; i < 10; i++) {
-      clock.advanceMillis(Duration.ofSeconds(1).toMillis());
-      for (int j = 0; j <= i; j++) {
-        Action action = mockActionWithMnemonic("Mnemonic" + i, "action-" + i + "-" + j + ".out");
-        stateTracker.actionStarted(new ActionStartedEvent(action, clock.nanoTime()));
-      }
-    }
-
-    for (int sampleSize = 1; sampleSize < 11; sampleSize++) {
-      stateTracker.setProgressMode(ProgressMode.MNEMONIC_HISTOGRAM, sampleSize);
-      LoggingTerminalWriter terminalWriter = new LoggingTerminalWriter(/*discardHighlight=*/ true);
-      stateTracker.writeProgressBar(terminalWriter);
-      String output = terminalWriter.getTranscript();
-      assertThat(output).contains("Mnemonic" + (10 - sampleSize) + " " + (10 - sampleSize + 1));
-      assertThat(output).doesNotContain("Mnemonic" + (10 - sampleSize - 1));
-    }
-  }
-
   private static class FetchEvent implements FetchProgress {
     private final String id;