Add support to BuildToolLogs for direct uris. RELNOTES: None PiperOrigin-RevId: 214379889
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) {
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; }