commit 24db557a994e2da4273f8ee11e08485365f4ad1f
author Googler <ahumesky@google.com> Tue Jun 27 11:56:16 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jun 27 11:57:50 2023 -0700
tree ebfcc8b23e5797a392d014dc4fb088eead0470e0
parent 6e90569c889a01166d652ab794b22070764a351d

Clarify that ActionOwner.getMnemonic() is actually the mnemonic of the build configuration.

RELNOTES: None.
PiperOrigin-RevId: 543811424
Change-Id: I36f85c1de2b6a64ad4650b1e5601300e7e1a46b1

src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java b/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java
index 643ee35..65f487c 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java
@@ -42,7 +42,7 @@
           /* label= */ null,
           Location.BUILTIN,
           /* targetKind= */ "empty target kind",
-          /* mnemonic= */ "system",
+          /* buildConfigurationMnemonic= */ "system",
           /* configurationChecksum= */ "system",
           /* buildConfigurationEvent= */ null,
           /* isToolConfiguration= */ false,
@@ -78,7 +78,7 @@
       @Nullable Label label,
       Location location,
       String targetKind,
-      String mnemonic,
+      String buildConfigurationMnemonic,
       String configurationChecksum,
       @Nullable BuildConfigurationEvent buildConfigurationEvent,
       boolean isToolConfiguration,
@@ -90,7 +90,10 @@
         location,
         targetKind,
         BuildConfigurationInfo.AutoBuildConfigurationInfo.create(
-            mnemonic, configurationChecksum, buildConfigurationEvent, isToolConfiguration),
+            buildConfigurationMnemonic,
+            configurationChecksum,
+            buildConfigurationEvent,
+            isToolConfiguration),
         executionPlatform,
         aspectDescriptors,
         execProperties);
@@ -112,7 +115,7 @@
   public abstract BuildConfigurationInfo getBuildConfigurationInfo();
 
   /** Returns the mnemonic for the configuration for this {@link ActionOwner}. */
-  public final String getMnemonic() {
+  public final String getBuildConfigurationMnemonic() {
     return getBuildConfigurationInfo().getMnemonic();
   }
 

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

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/UiStateTracker.java b/src/main/java/com/google/devtools/build/lib/runtime/UiStateTracker.java
index 45e0fe2..e2d5500 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/UiStateTracker.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/UiStateTracker.java
@@ -527,7 +527,8 @@
 
     getActionState(action, actionId, event.getNanoTimeStart());
 
-    if (action.getOwner() != null && action.getOwner().getMnemonic().equals("TestRunner")) {
+    if (action.getOwner() != null
+        && action.getOwner().getBuildConfigurationMnemonic().equals("TestRunner")) {
       Label owner = action.getOwner().getLabel();
       if (owner != null) {
         Set<Artifact> testActionsForOwner = testActions.get(owner);
@@ -601,7 +602,8 @@
 
     checkNotNull(activeActions.remove(actionId), "%s not active after %s", actionId, event);
 
-    if (action.getOwner() != null && action.getOwner().getMnemonic().equals("TestRunner")) {
+    if (action.getOwner() != null
+        && action.getOwner().getBuildConfigurationMnemonic().equals("TestRunner")) {
       Label owner = action.getOwner().getLabel();
       if (owner != null) {
         Set<Artifact> testActionsForOwner = testActions.get(owner);
@@ -748,7 +750,8 @@
   protected String describeAction(
       ActionState actionState, long nanoTime, int desiredWidth, Set<Artifact> toSkip) {
     ActionExecutionMetadata action = actionState.action;
-    if (action.getOwner() != null && action.getOwner().getMnemonic().equals("TestRunner")) {
+    if (action.getOwner() != null
+        && action.getOwner().getBuildConfigurationMnemonic().equals("TestRunner")) {
       Label owner = action.getOwner().getLabel();
       if (owner != null) {
         Set<Artifact> allRelatedActions = testActions.get(owner);