commit ccb43ee3eb2940883ef57c2e6491b8e1a9bd24ef
author jmmv <jmmv@google.com> Wed Aug 30 22:07:10 2017 +0200
committer Vladimir Moskva <vladmos@google.com> Thu Aug 31 13:44:40 2017 +0200
tree f4bec864969ff02b7169df3efebb34586bb0050f
parent 50f46e290b7f52123d99edb125d7b53dbe2b7b4d

Turn ActionCacheStatistics into a proto.

This is to avoid having to maintain an almost-equal Java data type once
we start externalizing statistics.

RELNOTES: None.
PiperOrigin-RevId: 167037360

src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index dc81d34..56b1b90 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -48,6 +48,7 @@
 import com.google.devtools.build.lib.actions.SpawnActionContext;
 import com.google.devtools.build.lib.actions.TestExecException;
 import com.google.devtools.build.lib.actions.cache.ActionCache;
+import com.google.devtools.build.lib.actions.cache.Protos.ActionCacheStatistics;
 import com.google.devtools.build.lib.analysis.BuildView.AnalysisResult;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.TopLevelArtifactContext;
@@ -96,7 +97,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -107,6 +107,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -720,7 +721,7 @@
    * capturing statistics.
    */
   private void saveActionCache(ActionCache actionCache) {
-    ActionCacheStatistics.Builder builder = ActionCacheStatistics.builder();
+    ActionCacheStatistics.Builder builder = ActionCacheStatistics.newBuilder();
 
     AutoProfiler p = AutoProfiler.profiledAndLogged("Saving action cache", ProfilerTask.INFO, log);
     try {
@@ -729,7 +730,8 @@
       builder.setSizeInBytes(0);
       getReporter().handle(Event.error("I/O error while writing action log: " + e.getMessage()));
     } finally {
-      builder.setSaveTime(Duration.ofNanos(p.completeAndGetElapsedTimeNanos()));
+      builder.setSaveTimeInMs(
+          TimeUnit.MILLISECONDS.convert(p.completeAndGetElapsedTimeNanos(), TimeUnit.NANOSECONDS));
     }
 
     env.getEventBus().post(builder.build());