Do not crash when attempting to upload a tree artifact.

These show up as directories. Filter these out and return null from the path converter, which should cause omission of those files from any build events.

RELNOTES: None
PiperOrigin-RevId: 208244910

1 files changed, 1 insertions, 17 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventArtifactUploader.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventArtifactUploader.java
index 284ce6de67..67a53142dd 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventArtifactUploader.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventArtifactUploader.java
@@ -13,30 +13,14 @@
 // limitations under the License.
 package com.google.devtools.build.lib.buildeventstream;
 
-import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.devtools.build.lib.buildeventstream.BuildEvent.LocalFile;
-import com.google.devtools.build.lib.buildeventstream.PathConverter.FileUriPathConverter;
 import com.google.devtools.build.lib.vfs.Path;
 import java.util.Map;
 
 /** Uploads artifacts referenced by the Build Event Protocol (BEP). */
 public interface BuildEventArtifactUploader {
-  BuildEventArtifactUploader LOCAL_FILES_UPLOADER =
-      new BuildEventArtifactUploader() {
-        private final ListenableFuture<PathConverter> completedPathConverter =
-            Futures.immediateFuture(new FileUriPathConverter());
-
-        @Override
-        public ListenableFuture<PathConverter> upload(Map<Path, LocalFile> files) {
-          return completedPathConverter;
-        }
-
-        @Override
-        public void shutdown() {
-          // Intentionally left empty.
-        }
-      };
+  BuildEventArtifactUploader LOCAL_FILES_UPLOADER = new LocalFilesArtifactUploader();
 
   /**
    * Asynchronously uploads a set of files referenced by the protobuf representation of a {@link