Better distinguish subcommand log statements by logging description

Now, when subcommands are logged due to the -s option, the action's
description is logged in an bracketed note after the label.

--
MOS_MIGRATED_REVID=93886445

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/standalone/LocalSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/standalone/LocalSpawnStrategy.java
index fc2387c896..662c35ea07 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/LocalSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/LocalSpawnStrategy.java
@@ -57,8 +57,9 @@ public class LocalSpawnStrategy implements SpawnActionContext {
       throws ExecException {
     Executor executor = actionExecutionContext.getExecutor();
     if (executor.reportsSubcommands()) {
-      executor.reportSubcommand(Label.print(spawn.getOwner().getLabel()),
-          spawn.asShellCommand(executor.getExecRoot()));
+      executor.reportSubcommand(
+          Label.print(spawn.getOwner().getLabel()) + " [" + spawn.getResourceOwner().prettyPrint()
+              + "]", spawn.asShellCommand(executor.getExecRoot()));
     }
 
     // We must wrap the subprocess with process-wrapper to kill the process tree.