Omit parts of BEP events (like stdout, stderr) when the associated artifact uploader cannot upload a particular file.

RELNOTES: None
PiperOrigin-RevId: 204167372

2 files changed, 11 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java b/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java
index 0160345b3d..8624658c7d 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java
@@ -83,7 +83,9 @@ class NamedArtifactGroup implements BuildEvent {
       }
       String name = artifact.getRootRelativePathString();
       String uri = pathConverter.apply(artifact.getPath());
-      builder.addFiles(BuildEventStreamProtos.File.newBuilder().setName(name).setUri(uri));
+      if (uri != null) {
+        builder.addFiles(BuildEventStreamProtos.File.newBuilder().setName(name).setUri(uri));
+      }
     }
     for (NestedSetView<Artifact> child : view.transitives()) {
       builder.addFileSets(namer.apply(child.identifier()));
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/TestSummary.java b/src/main/java/com/google/devtools/build/lib/runtime/TestSummary.java
index 098e17ac22..7b5a804dbb 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/TestSummary.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/TestSummary.java
@@ -511,12 +511,16 @@ public class TestSummary implements Comparable<TestSummary>, BuildEventWithOrder
             .setTotalNumCached(getNumCached())
             .setTotalRunCount(totalRuns());
     for (Path path : getFailedLogs()) {
-      summaryBuilder.addFailed(
-          BuildEventStreamProtos.File.newBuilder().setUri(pathConverter.apply(path)).build());
+      String uri = pathConverter.apply(path);
+      if (uri != null) {
+        summaryBuilder.addFailed(BuildEventStreamProtos.File.newBuilder().setUri(uri).build());
+      }
     }
     for (Path path : getPassedLogs()) {
-      summaryBuilder.addPassed(
-          BuildEventStreamProtos.File.newBuilder().setUri(pathConverter.apply(path)).build());
+      String uri = pathConverter.apply(path);
+      if (uri != null) {
+        summaryBuilder.addPassed(BuildEventStreamProtos.File.newBuilder().setUri(uri).build());
+      }
     }
     return GenericBuildEvent.protoChaining(this).setTestSummary(summaryBuilder.build()).build();
   }