commit 9f908cada13c9015f267f368f263c361df812983
author Cristian Hancila <chancila@gmail.com> Tue Apr 05 01:36:30 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 05 01:37:44 2022 -0700
tree 78aa1d57ca15233b8a7590c477794866d261989a
parent c7c3fa1e97ad73ec95c310af2ffb692069a565eb

Add target label to SpawnExec in the execution log

The execution log is very handy for tracking fine grain build data for analysis, however there's no easy way to correlate the action data to a target, this change simply adds the owning target's label to the SpawnExec info to enable this correlation.

Closes #14818.

PiperOrigin-RevId: 439516075

src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java

diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java
index b1e8c64..8da6e88 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java
@@ -156,6 +156,11 @@
     }
     builder.setMnemonic(spawn.getMnemonic());
     builder.setWalltime(Durations.fromNanos(result.getMetrics().executionWallTime().toNanos()));
+
+    if (spawn.getTargetLabel() != null) {
+      builder.setTargetLabel(spawn.getTargetLabel());
+    }
+
     executionLog.write(builder.build());
   }
 

src/main/protobuf/spawn.proto

diff --git a/src/main/protobuf/spawn.proto b/src/main/protobuf/spawn.proto
index 039a561..1507add 100644
--- a/src/main/protobuf/spawn.proto
+++ b/src/main/protobuf/spawn.proto
@@ -132,4 +132,8 @@
   // The wall time it took to execute the Spawn. This is only the time spent in
   // the subprocess, not including the time doing setup and teardown.
   google.protobuf.Duration walltime = 17;
+
+  // Canonical label of the target that emitted this spawn, may not always be
+  // set.
+  string target_label = 18;
 }

src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java
index 1731188..67c07c6 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java
@@ -367,6 +367,7 @@
             .setMnemonic("MyMnemonic")
             .setRunner("runner")
             .setWalltime(Duration.getDefaultInstance())
+            .setTargetLabel("//dummy:label")
             .build();
     verify(messageOutput).write(expectedSpawnLog);
   }
@@ -493,6 +494,7 @@
         .setStatus("NON_ZERO_EXIT")
         .setExitCode(23)
         .setRemoteCacheable(true)
-        .setWalltime(Duration.getDefaultInstance());
+        .setWalltime(Duration.getDefaultInstance())
+        .setTargetLabel("//dummy:label");
   }
 }