BuildToolLogs: clean up interface

For build log files that are inlined, we eventually have to
report ByteStrings, so avoid the detour through strings,
potentially causing encoding issues.

PiperOrigin-RevId: 175647576

2 files changed, 9 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildToolLogs.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildToolLogs.java
index 23e1b07e53..8cf96ede22 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildToolLogs.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildToolLogs.java
@@ -17,16 +17,15 @@ import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.protobuf.ByteString;
-import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 
 /** Event reporting on statistics about the build. */
 public class BuildToolLogs implements BuildEventWithOrderConstraint {
-  private final Collection<Pair<String, String>> directValues;
+  private final Collection<Pair<String, ByteString>> directValues;
   private final Collection<Pair<String, Path>> logFiles;
 
   public BuildToolLogs(
-      Collection<Pair<String, String>> directValues, Collection<Pair<String, Path>> logFiles) {
+      Collection<Pair<String, ByteString>> directValues, Collection<Pair<String, Path>> logFiles) {
     this.directValues = directValues;
     this.logFiles = logFiles;
   }
@@ -45,11 +44,11 @@ public class BuildToolLogs implements BuildEventWithOrderConstraint {
   public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) {
     BuildEventStreamProtos.BuildToolLogs.Builder toolLogs =
         BuildEventStreamProtos.BuildToolLogs.newBuilder();
-    for (Pair<String, String> direct : directValues) {
+    for (Pair<String, ByteString> direct : directValues) {
       toolLogs.addLog(
           BuildEventStreamProtos.File.newBuilder()
               .setName(direct.getFirst())
-              .setContents(ByteString.copyFrom(direct.getSecond().getBytes(StandardCharsets.UTF_8)))
+              .setContents(direct.getSecond())
               .build());
     }
     for (Pair<String, Path> logFile : logFiles) {
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 d5a8750299..b5ea61dca5 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
@@ -29,6 +29,7 @@ import com.google.devtools.build.lib.exec.ExecutorBuilder;
 import com.google.devtools.build.lib.profiler.Profiler;
 import com.google.devtools.build.lib.profiler.ProfilerTask;
 import com.google.devtools.build.lib.util.Pair;
+import com.google.protobuf.ByteString;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
@@ -78,18 +79,18 @@ public class BuildSummaryStatsModule extends BlazeModule {
   public void buildComplete(BuildCompleteEvent event) {
     try {
       // We might want to make this conditional on a flag; it can sometimes be a bit of a nuisance.
-      List<Pair<String, String>> statistics = new ArrayList<>();
+      List<Pair<String, ByteString>> statistics = new ArrayList<>();
       List<String> items = new ArrayList<>();
       items.add(String.format("Elapsed time: %.3fs", event.getResult().getElapsedSeconds()));
-      statistics.add(
-          Pair.of("elapsed time", String.format("%f", event.getResult().getElapsedSeconds())));
+      statistics.add(Pair.of("elapsed time", ByteString.copyFromUtf8(
+          String.format("%f", event.getResult().getElapsedSeconds()))));
 
       if (criticalPathComputer != null) {
         Profiler.instance().startTask(ProfilerTask.CRITICAL_PATH, "Critical path");
         AggregatedCriticalPath<SimpleCriticalPathComponent> criticalPath =
             criticalPathComputer.aggregate();
         items.add(criticalPath.toStringSummary());
-        statistics.add(Pair.of("critical path", criticalPath.toString()));
+        statistics.add(Pair.of("critical path", ByteString.copyFromUtf8(criticalPath.toString())));
         logger.info(criticalPath.toString());
         logger.info(
             "Slowest actions:\n  "