commit bed7aba2099a22ad1b4db1edea9a60dd6aee1093
author Googler <noreply@google.com> Thu Oct 18 14:19:11 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Thu Oct 18 14:21:08 2018 -0700
tree 7ff41b4f34b7718a0b66824fa60a61989b6a5f0a
parent 1568cfd2599aee0a43888c6ca28512a780131c65

Removing as-of-yet useless Remote statistics from Bazel output.

Fixes #6208

RELNOTES: None
PiperOrigin-RevId: 217767561

src/main/java/com/google/devtools/build/lib/runtime/AggregatedCriticalPath.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/AggregatedCriticalPath.java b/src/main/java/com/google/devtools/build/lib/runtime/AggregatedCriticalPath.java
index 1f30050..8c569c4 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/AggregatedCriticalPath.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/AggregatedCriticalPath.java
@@ -56,7 +56,23 @@
 
   @Override
   public String toString() {
-    return toString(false);
+    return toString(false, true);
+  }
+
+  private String toString(boolean summary, boolean remote) {
+    StringBuilder sb = new StringBuilder("Critical Path: ");
+    sb.append(String.format("%.2f", totalTime.toMillis() / 1000.0));
+    sb.append("s");
+    if (remote) {
+      sb.append(", Remote ");
+      sb.append(getSpawnMetrics().toString(totalTime(), summary));
+    }
+    if (summary || criticalPathComponents.isEmpty()) {
+      return sb.toString();
+    }
+    sb.append("\n  ");
+    Joiner.on("\n  ").appendTo(sb, criticalPathComponents);
+    return sb.toString();
   }
 
   /**
@@ -64,20 +80,15 @@
    * to the user.
    */
   public String toStringSummary() {
-    return toString(true);
+    return toString(true, true);
   }
 
-  private String toString(boolean summary) {
-    StringBuilder sb = new StringBuilder("Critical Path: ");
-    sb.append(String.format("%.2f", totalTime.toMillis() / 1000.0));
-    sb.append("s, Remote ");
-    sb.append(getSpawnMetrics().toString(totalTime(), summary));
-    if (summary || criticalPathComponents.isEmpty()) {
-      return sb.toString();
-    }
-    sb.append("\n  ");
-    Joiner.on("\n  ").appendTo(sb, criticalPathComponents);
-    return sb.toString();
+  /**
+   * Same as toStringSummary but also omits remote stats. This is to be used in Bazel because
+   * currently the Remote stats are not calculated correctly.
+   */
+  public String toStringSummaryNoRemote() {
+    return toString(true, false);
   }
 }
 

src/main/java/com/google/devtools/build/lib/runtime/BuildSummaryStatsModule.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BuildSummaryStatsModule.java b/src/main/java/com/google/devtools/build/lib/runtime/BuildSummaryStatsModule.java
index cfcce0b..d2fb6cb 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BuildSummaryStatsModule.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BuildSummaryStatsModule.java
@@ -105,7 +105,7 @@
             Profiler.instance().profile(ProfilerTask.CRITICAL_PATH, "Critical path")) {
           AggregatedCriticalPath criticalPath =
               criticalPathComputer.aggregate();
-          items.add(criticalPath.toStringSummary());
+          items.add(criticalPath.toStringSummaryNoRemote());
           statistics.add(
               Pair.of("critical path", ByteString.copyFromUtf8(criticalPath.toString())));
           logger.info(criticalPath.toString());