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

RELNOTES: None
PiperOrigin-RevId: 204167372

1 files changed, 15 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutedEvent.java b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutedEvent.java
index 372c5598ec..f903503bf6 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutedEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutedEvent.java
@@ -144,18 +144,18 @@ public class ActionExecutedEvent implements BuildEventWithConfiguration, Progres
       actionBuilder.setExitCode(exception.getExitCode().getNumericExitCode());
     }
     if (stdout != null) {
-      actionBuilder.setStdout(
-          BuildEventStreamProtos.File.newBuilder()
-          .setName("stdout")
-          .setUri(pathConverter.apply(stdout))
-          .build());
+      String uri = pathConverter.apply(stdout);
+      if (uri != null) {
+        actionBuilder.setStdout(
+            BuildEventStreamProtos.File.newBuilder().setName("stdout").setUri(uri).build());
+      }
     }
     if (stderr != null) {
-      actionBuilder.setStderr(
-          BuildEventStreamProtos.File.newBuilder()
-          .setName("stderr")
-          .setUri(pathConverter.apply(stderr))
-          .build());
+      String uri = pathConverter.apply(stderr);
+      if (uri != null) {
+        actionBuilder.setStderr(
+            BuildEventStreamProtos.File.newBuilder().setName("stderr").setUri(uri).build());
+      }
     }
     if (action.getOwner() != null && action.getOwner().getLabel() != null) {
       actionBuilder.setLabel(action.getOwner().getLabel().toString());
@@ -168,10 +168,11 @@ public class ActionExecutedEvent implements BuildEventWithConfiguration, Progres
       actionBuilder.setConfiguration(configuration.getEventId().asStreamProto().getConfiguration());
     }
     if (exception == null) {
-      actionBuilder.setPrimaryOutput(
-          BuildEventStreamProtos.File.newBuilder()
-              .setUri(pathConverter.apply(action.getPrimaryOutput().getPath()))
-              .build());
+      String uri = pathConverter.apply(action.getPrimaryOutput().getPath());
+      if (uri != null) {
+        actionBuilder.setPrimaryOutput(
+            BuildEventStreamProtos.File.newBuilder().setUri(uri).build());
+      }
     }
     try {
       if (action instanceof CommandAction) {