commit acf736d52304efeb5fff90d1afa385dc7359d41b
author Emil Kattainen <emilkattainen@gmail.com> Thu Jul 14 05:10:52 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jul 14 05:12:07 2022 -0700
tree 16197e4ebe17158068371fd06e85c44727f7df9e
parent adfe1c064d966d7a61488a22c187bb1efaf0fb1c

Forward detailed timing breakdown of test results

Forward detailed timing breakdown of test results to
ExecutionInfo in StandaloneTestResult.

Closes #15284.

PiperOrigin-RevId: 460933130
Change-Id: I0cf786f14aee1a48dd49cf5288f7bd839eb3554f

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

diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
index 885ff46..09dbe44 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
@@ -38,6 +38,7 @@
 import com.google.devtools.build.lib.actions.SimpleSpawn;
 import com.google.devtools.build.lib.actions.Spawn;
 import com.google.devtools.build.lib.actions.SpawnContinuation;
+import com.google.devtools.build.lib.actions.SpawnMetrics;
 import com.google.devtools.build.lib.actions.SpawnResult;
 import com.google.devtools.build.lib.actions.TestExecException;
 import com.google.devtools.build.lib.actions.cache.MetadataHandler;
@@ -66,6 +67,7 @@
 import com.google.devtools.build.lib.view.test.TestStatus.BlazeTestStatus;
 import com.google.devtools.build.lib.view.test.TestStatus.TestCase;
 import com.google.devtools.build.lib.view.test.TestStatus.TestResultData;
+import com.google.protobuf.util.Durations;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
@@ -487,21 +489,76 @@
       SpawnResult spawnResult, TestResultData.Builder result) {
     BuildEventStreamProtos.TestResult.ExecutionInfo.Builder executionInfo =
         BuildEventStreamProtos.TestResult.ExecutionInfo.newBuilder();
+
     if (spawnResult.isCacheHit()) {
       result.setRemotelyCached(true);
       executionInfo.setCachedRemotely(true);
     }
+
     String strategy = spawnResult.getRunnerName();
     if (strategy != null) {
       executionInfo.setStrategy(strategy);
       result.setIsRemoteStrategy(strategy.equals("remote"));
     }
+
     if (spawnResult.getExecutorHostName() != null) {
       executionInfo.setHostname(spawnResult.getExecutorHostName());
     }
+
+    SpawnMetrics sm = spawnResult.getMetrics();
+    executionInfo.setTimingBreakdown(
+        BuildEventStreamProtos.TestResult.ExecutionInfo.TimingBreakdown.newBuilder()
+            .setName("totalTime")
+            .setTime(toProtoDuration(sm.totalTime()))
+            .addChild(
+                BuildEventStreamProtos.TestResult.ExecutionInfo.TimingBreakdown.newBuilder()
+                    .setName("parseTime")
+                    .setTime(toProtoDuration(sm.parseTime()))
+                    .build())
+            .addChild(
+                BuildEventStreamProtos.TestResult.ExecutionInfo.TimingBreakdown.newBuilder()
+                    .setName("fetchTime")
+                    .setTime(toProtoDuration(sm.fetchTime()))
+                    .build())
+            .addChild(
+                BuildEventStreamProtos.TestResult.ExecutionInfo.TimingBreakdown.newBuilder()
+                    .setName("queueTime")
+                    .setTime(toProtoDuration(sm.queueTime()))
+                    .build())
+            .addChild(
+                BuildEventStreamProtos.TestResult.ExecutionInfo.TimingBreakdown.newBuilder()
+                    .setName("uploadTime")
+                    .setTime(toProtoDuration(sm.uploadTime()))
+                    .build())
+            .addChild(
+                BuildEventStreamProtos.TestResult.ExecutionInfo.TimingBreakdown.newBuilder()
+                    .setName("setupTime")
+                    .setTime(toProtoDuration(sm.setupTime()))
+                    .build())
+            .addChild(
+                BuildEventStreamProtos.TestResult.ExecutionInfo.TimingBreakdown.newBuilder()
+                    .setName("executionWallTime")
+                    .setTime(toProtoDuration(sm.executionWallTime()))
+                    .build())
+            .addChild(
+                BuildEventStreamProtos.TestResult.ExecutionInfo.TimingBreakdown.newBuilder()
+                    .setName("processOutputsTime")
+                    .setTime(toProtoDuration(sm.processOutputsTime()))
+                    .build())
+            .addChild(
+                BuildEventStreamProtos.TestResult.ExecutionInfo.TimingBreakdown.newBuilder()
+                    .setName("networkTime")
+                    .setTime(toProtoDuration(sm.networkTime()))
+                    .build())
+            .build());
+
     return executionInfo.build();
   }
 
+  private static com.google.protobuf.Duration toProtoDuration(Duration d) {
+    return Durations.fromNanos(d.toNanos());
+  }
+
   private static Artifact.DerivedArtifact createArtifactOutput(
       TestRunnerAction action, PathFragment outputPath) {
     Artifact.DerivedArtifact testLog = (Artifact.DerivedArtifact) action.getTestLog();