commit d65ed23beb4b97c6b33eb7d625f98da7e0893b58
author tomlu <tomlu@google.com> Mon Sep 24 21:07:31 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon Sep 24 21:09:49 2018 -0700
tree f80625757c275fc520f730c3203695e632136737
parent ebc18f6632d6f54d6d88efade574df9bca30e0a1

Add support to BuildToolLogs for direct uris.

RELNOTES: None
PiperOrigin-RevId: 214379889

src/main/java/com/google/devtools/build/lib/buildeventstream/BuildToolLogs.java

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 eb5358b..fe27a99 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
@@ -23,11 +23,15 @@
 /** Event reporting on statistics about the build. */
 public class BuildToolLogs implements BuildEventWithOrderConstraint {
   private final Collection<Pair<String, ByteString>> directValues;
+  private final Collection<Pair<String, String>> directUris;
   private final Collection<Pair<String, Path>> logFiles;
 
   public BuildToolLogs(
-      Collection<Pair<String, ByteString>> directValues, Collection<Pair<String, Path>> logFiles) {
+      Collection<Pair<String, ByteString>> directValues,
+      Collection<Pair<String, String>> directUris,
+      Collection<Pair<String, Path>> logFiles) {
     this.directValues = directValues;
+    this.directUris = directUris;
     this.logFiles = logFiles;
   }
 
@@ -61,6 +65,13 @@
               .setContents(direct.getSecond())
               .build());
     }
+    for (Pair<String, String> direct : directUris) {
+      toolLogs.addLog(
+          BuildEventStreamProtos.File.newBuilder()
+              .setName(direct.getFirst())
+              .setUri(direct.getSecond())
+              .build());
+    }
     for (Pair<String, Path> logFile : logFiles) {
       String uri = converters.pathConverter().apply(logFile.getSecond());
       if (uri != null) {

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 cd39b50..cfcce0b 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
@@ -132,7 +132,7 @@
       reporter.handle(Event.info(spawnSummary));
       statistics.add(Pair.of("process stats", ByteString.copyFromUtf8(spawnSummary)));
 
-      reporter.post(new BuildToolLogs(statistics, ImmutableList.of()));
+      reporter.post(new BuildToolLogs(statistics, ImmutableList.of(), ImmutableList.of()));
     } finally {
       criticalPathComputer = null;
     }