Automated g4 rollback of commit 3d596d6.

*** Reason for rollback ***

Made BuildEventStreamerTest#testSimpleStream 3% flaky based on --runs_per_test=1000.
RELNOTES: None
PiperOrigin-RevId: 154090559

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

@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.buildeventstream;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.Future;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -27,11 +27,6 @@
 @ThreadSafe
 public interface BuildEventTransport {
 
-  /**
-   * The name of this transport as can be displayed to a user.
-   */
-  String name();
-
   /**
    * Writes a build event to an endpoint. This method will always return quickly and will not
    * wait for the write to complete.
@@ -54,5 +49,5 @@ public interface BuildEventTransport {
    *
    * <p>This method should not throw any exceptions.
    */
-  ListenableFuture<Void> close();
+  Future<Void> close();
 }

src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BinaryFormatFileTransport.java

@@ -43,11 +43,6 @@ public final class BinaryFormatFileTransport extends FileTransport {
     this.pathConverter = pathConverter;
   }
 
-  @Override
-  public String name() {
-    return this.getClass().getSimpleName();
-  }
-
   @Override
   public synchronized void sendBuildEvent(BuildEvent event, final ArtifactGroupNamer namer) {
     BuildEventConverters converters =

src/main/java/com/google/devtools/build/lib/buildeventstream/transports/FileTransport.java

@@ -18,7 +18,6 @@
 import static com.google.common.base.Preconditions.checkState;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import com.google.devtools.build.lib.buildeventstream.BuildEvent;
 import com.google.devtools.build.lib.buildeventstream.BuildEventTransport;
@@ -28,6 +27,7 @@
 import java.nio.channels.CompletionHandler;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -87,7 +87,7 @@ synchronized void writeData(byte[] data) {
   }
 
   @Override
-  public synchronized ListenableFuture<Void> close() {
+  public synchronized Future<Void> close() {
     if (closing()) {
       return closeFuture;
     }

src/main/java/com/google/devtools/build/lib/buildeventstream/transports/TextFormatFileTransport.java

@@ -37,11 +37,6 @@ public final class TextFormatFileTransport extends FileTransport {
     this.pathConverter = pathConverter;
   }
 
-  @Override
-  public String name() {
-    return this.getClass().getSimpleName();
-  }
-
   @Override
   public synchronized void sendBuildEvent(BuildEvent event, final ArtifactGroupNamer namer) {
     BuildEventConverters converters =

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

@@ -14,31 +14,23 @@
 
 package com.google.devtools.build.lib.runtime;
 
-import static com.google.devtools.build.lib.events.Event.of;
-import static com.google.devtools.build.lib.events.EventKind.PROGRESS;
-import static com.google.devtools.build.lib.util.Preconditions.checkArgument;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.google.common.eventbus.Subscribe;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
 import com.google.devtools.build.lib.actions.ActionExecutedEvent;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.EventReportingArtifacts;
 import com.google.devtools.build.lib.analysis.NoBuildEvent;
 import com.google.devtools.build.lib.buildeventstream.AbortedEvent;
-import com.google.devtools.build.lib.buildeventstream.AnnounceBuildEventTransportsEvent;
 import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer;
 import com.google.devtools.build.lib.buildeventstream.BuildEvent;
 import com.google.devtools.build.lib.buildeventstream.BuildEventId;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.Aborted.AbortReason;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId.NamedSetOfFilesId;
 import com.google.devtools.build.lib.buildeventstream.BuildEventTransport;
-import com.google.devtools.build.lib.buildeventstream.BuildEventTransportClosedEvent;
 import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint;
 import com.google.devtools.build.lib.buildeventstream.ProgressEvent;
 import com.google.devtools.build.lib.buildtool.buildevent.BuildCompleteEvent;
@@ -47,7 +39,6 @@
 import com.google.devtools.build.lib.collect.nestedset.NestedSetView;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.EventHandler;
-import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.rules.extra.ExtraAction;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -56,26 +47,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.Future;
 import java.util.logging.Logger;
 
-/**
- * Listens for {@link BuildEvent}s and streams them to the provided {@link BuildEventTransport}s.
- *
- * <p>The streamer takes care of closing all {@link BuildEventTransport}s. It does so after having
- * received a {@link BuildCompleteEvent}. Furthermore, it emits two event types to the
- * {@code eventBus}. After having received the first {@link BuildEvent} it emits a
- * {@link AnnounceBuildEventTransportsEvent} that contains a list of all its transports.
- * Furthermore, after a transport has been closed, it emits
- * a {@link BuildEventTransportClosedEvent}.
- */
+/** Listen for {@link BuildEvent} and stream them to the provided {@link BuildEventTransport}. */
 public class BuildEventStreamer implements EventHandler {
 
   private final Collection<BuildEventTransport> transports;
-  private final Reporter reporter;
   private Set<BuildEventId> announcedEvents;
   private final Set<BuildEventId> postedEvents = new HashSet<>();
   private final Multimap<BuildEventId, BuildEvent> pendingEvents = HashMultimap.create();
@@ -115,10 +93,8 @@ synchronized String maybeName(NestedSetView<Artifact> view) {
     }
   }
 
-  public BuildEventStreamer(Collection<BuildEventTransport> transports, Reporter reporter) {
-    checkArgument(transports.size() > 0);
+  public BuildEventStreamer(Collection<BuildEventTransport> transports) {
     this.transports = transports;
-    this.reporter = reporter;
     this.announcedEvents = null;
     this.progressCount = 0;
   }
@@ -143,10 +119,6 @@ private void post(BuildEvent event) {
           announcedEvents.addAll(linkEvent.getChildrenEvents());
           postedEvents.add(linkEvent.getEventId());
         }
-
-        if (reporter != null) {
-          reporter.post(new AnnounceBuildEventTransportsEvent(transports));
-        }
       } else {
         if (!announcedEvents.contains(id)) {
           linkEvent = ProgressEvent.progressChainIn(progressCount, id);
@@ -193,57 +165,20 @@ private void clearAnnouncedEvents() {
     }
   }
 
-  private ScheduledFuture<?> bepUploadWaitEvent(ScheduledExecutorService executor) {
-    final long startNanos = System.nanoTime();
-    return executor.scheduleAtFixedRate(new Runnable() {
-      @Override
-      public void run() {
-        long deltaNanos = System.nanoTime() - startNanos;
-        long deltaSeconds = TimeUnit.NANOSECONDS.toSeconds(deltaNanos);
-        Event waitEvt =
-            of(PROGRESS, null, "Waiting for build event protocol upload: " + deltaSeconds + "s");
-        if (reporter != null) {
-          reporter.handle(waitEvt);
-        }
-      }
-    }, 0, 1, TimeUnit.SECONDS);
-  }
-
   private void close() {
-    ScheduledExecutorService executor = null;
-    try {
-      executor = Executors.newSingleThreadScheduledExecutor();
-      List<ListenableFuture<Void>> closeFutures = new ArrayList<>(transports.size());
-      for (final BuildEventTransport transport : transports) {
-        ListenableFuture<Void> closeFuture = transport.close();
-        closeFuture.addListener(new Runnable() {
-          @Override
-          public void run() {
-            if (reporter != null) {
-              reporter.post(new BuildEventTransportClosedEvent(transport));
-            }
-          }
-        }, executor);
-        closeFutures.add(closeFuture);
-      }
+    List<Future<Void>> shutdownFutures = new ArrayList<>(transports.size());
 
-      try {
-        if (closeFutures.isEmpty()) {
-          // Don't spam events if there is nothing to close.
-          return;
-        }
+    for (BuildEventTransport transport : transports) {
+      shutdownFutures.add(transport.close());
+    }
 
-        ScheduledFuture<?> f = bepUploadWaitEvent(executor);
-        // Wait for all transports to close.
-        Futures.allAsList(closeFutures).get();
-        f.cancel(true);
+    // Wait for all transports to close.
+    for (Future<Void> f : shutdownFutures) {
+      try {
+        f.get();
       } catch (Exception e) {
         log.severe("Failed to close a build event transport: " + e);
       }
-    } finally {
-      if (executor != null) {
-        executor.shutdown();
-      }
     }
   }
 

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

@@ -108,8 +108,7 @@ public String apply(Path path) {
       ImmutableSet<BuildEventTransport> buildEventTransports
           = createFromOptions(besOptions, pathConverter);
       if (!buildEventTransports.isEmpty()) {
-        BuildEventStreamer streamer = new BuildEventStreamer(buildEventTransports,
-            commandEnvironment != null ? commandEnvironment.getReporter() : null);
+        BuildEventStreamer streamer = new BuildEventStreamer(buildEventTransports);
         return Optional.of(streamer);
       }
     } catch (IOException e) {