commit d9aa8aea0e248415e3a237f807aa909417dbe3c2
author Googler <noreply@google.com> Wed May 20 00:56:28 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed May 20 00:57:35 2020 -0700
tree 4fa21244ae3d1884197cdd306d592589b580b235
parent 6ef0983093d0a1a6fee142ab66f026a0c9719779

Prepare SpawnMetrics to be used for workers

This introduces an enum `SpawnMetrics.ExecKind` to indicate whether
the metrics refer to remote/local/worker execution and renames a few
fields/methods (e.g., dropping the "remote" prefix) to avoid confusion.

RELNOTES: None.
PiperOrigin-RevId: 312436344

src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
index c781ffd..ad1f45f 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
@@ -292,13 +292,7 @@
     verify(localRunner).exec(eq(spawn), eq(policy));
     verify(runner)
         .execLocallyAndUpload(
-            eq(spawn),
-            eq(policy),
-            any(),
-            any(),
-            any(),
-            any(),
-            /* uploadLocalResults= */ eq(true));
+            eq(spawn), eq(policy), any(), any(), any(), any(), /* uploadLocalResults= */ eq(true));
     verify(cache, never()).upload(any(), any(), any(), any(), any(), any());
   }
 
@@ -334,13 +328,7 @@
     verify(localRunner).exec(eq(spawn), eq(policy));
     verify(runner)
         .execLocallyAndUpload(
-            eq(spawn),
-            eq(policy),
-            any(),
-            any(),
-            any(),
-            any(),
-            /* uploadLocalResults= */ eq(true));
+            eq(spawn), eq(policy), any(), any(), any(), any(), /* uploadLocalResults= */ eq(true));
     verify(cache).upload(any(), any(), any(), any(), any(), any());
     verify(cache, never()).download(any(ActionResult.class), any(Path.class), eq(outErr), any());
   }
@@ -988,10 +976,10 @@
   public void accountingAddsDurationsForStages() {
     SpawnMetrics.Builder builder =
         new SpawnMetrics.Builder()
-            .setRemoteQueueTime(Duration.ofSeconds(1))
+            .setQueueTime(Duration.ofSeconds(1))
             .setSetupTime(Duration.ofSeconds(2))
             .setExecutionWallTime(Duration.ofSeconds(2))
-            .setRemoteProcessOutputsTime(Duration.ofSeconds(2));
+            .setProcessOutputsTime(Duration.ofSeconds(2));
     Timestamp queued = Timestamp.getDefaultInstance();
     com.google.protobuf.Duration oneSecond = Durations.fromMillis(1000);
     Timestamp workerStart = Timestamps.add(queued, oneSecond);
@@ -1012,13 +1000,13 @@
     RemoteSpawnRunner.spawnMetricsAccounting(builder, executedMetadata);
     SpawnMetrics spawnMetrics = builder.build();
     // remote queue time is accumulated
-    assertThat(spawnMetrics.remoteQueueTime()).isEqualTo(Duration.ofSeconds(2));
+    assertThat(spawnMetrics.queueTime()).isEqualTo(Duration.ofSeconds(2));
     // setup time is substituted
     assertThat(spawnMetrics.setupTime()).isEqualTo(Duration.ofSeconds(1));
     // execution time is unspecified, assume substituted
     assertThat(spawnMetrics.executionWallTime()).isEqualTo(Duration.ofSeconds(1));
-    // remoteProcessOutputs time is unspecified, assume substituted
-    assertThat(spawnMetrics.remoteProcessOutputsTime()).isEqualTo(Duration.ofSeconds(1));
+    // ProcessOutputs time is unspecified, assume substituted
+    assertThat(spawnMetrics.processOutputsTime()).isEqualTo(Duration.ofSeconds(1));
   }
 
   private static Spawn newSimpleSpawn(Artifact... outputs) {