Adding a property name to the SpawnRunner. Most runners already had it, I just add it to the interface, and include it in the SpawnResult. This will be used to categorize/aggregate spawns executed by various runners.

Also, minor refinement to the cacheHit property of the SpawnResult with remote execution.

RELNOTES: None
TESTED=presubmit, next cl
PiperOrigin-RevId: 186637978

1 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
index 31e68be8f8..f720d8cc12 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
@@ -91,6 +91,11 @@ final class WorkerSpawnRunner implements SpawnRunner {
   }
 
   @Override
+  public String getName() {
+    return "worker";
+  }
+
+  @Override
   public SpawnResult exec(Spawn spawn, SpawnExecutionPolicy policy)
       throws ExecException, IOException, InterruptedException {
     if (!spawn.getExecutionInfo().containsKey(ExecutionRequirements.SUPPORTS_WORKERS)
@@ -103,11 +108,11 @@ final class WorkerSpawnRunner implements SpawnRunner {
       return fallbackRunner.exec(spawn, policy);
     }
 
-    policy.report(ProgressStatus.SCHEDULING, "worker");
+    policy.report(ProgressStatus.SCHEDULING, getName());
     ActionExecutionMetadata owner = spawn.getResourceOwner();
     try (ResourceHandle handle =
         ResourceManager.instance().acquireResources(owner, spawn.getLocalResources())) {
-      policy.report(ProgressStatus.EXECUTING, "worker");
+      policy.report(ProgressStatus.EXECUTING, getName());
       return actuallyExec(spawn, policy);
     }
   }
@@ -161,6 +166,7 @@ final class WorkerSpawnRunner implements SpawnRunner {
 
     int exitCode = response.getExitCode();
     return new SpawnResult.Builder()
+        .setRunnerName(getName())
         .setExitCode(exitCode)
         .setStatus(exitCode == 0 ? SpawnResult.Status.SUCCESS : SpawnResult.Status.NON_ZERO_EXIT)
         .setWallTime(wallTime)