Automated rollback of commit d65ed23beb4b97c6b33eb7d625f98da7e0893b58. *** Reason for rollback *** Internal breakages. *** Original change description *** Add support to BuildToolLogs for direct uris. RELNOTES: None PiperOrigin-RevId: 214434529
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 fe27a99..eb5358b 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,15 +23,11 @@ /** 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, String>> directUris, - Collection<Pair<String, Path>> logFiles) { + Collection<Pair<String, ByteString>> directValues, Collection<Pair<String, Path>> logFiles) { this.directValues = directValues; - this.directUris = directUris; this.logFiles = logFiles; } @@ -65,13 +61,6 @@ .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 cfcce0b..cd39b50 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(), ImmutableList.of())); + reporter.post(new BuildToolLogs(statistics, ImmutableList.of())); } finally { criticalPathComputer = null; }