BEP: Merge all failures into the Aborted event

In this way, for each event there can only be two event payloads
for every event identifier: the expected one, and the Aborted event.
The type of failure will be reported in the AbortReason enum value.

Change-Id: Icce225ec156d1fc20c8facd18df13343712f775c
PiperOrigin-RevId: 162911732

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java b/src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java
index 463fbfbde1..1d94871501 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java
@@ -59,8 +59,11 @@ public final class PatternExpandingError implements BuildEvent {
 
   @Override
   public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) {
-    BuildEventStreamProtos.LoadingFailure failure =
-        BuildEventStreamProtos.LoadingFailure.newBuilder().setDetails(message).build();
-    return GenericBuildEvent.protoChaining(this).setLoadingFailed(failure).build();
+    BuildEventStreamProtos.Aborted failure =
+        BuildEventStreamProtos.Aborted.newBuilder()
+            .setReason(BuildEventStreamProtos.Aborted.AbortReason.LOADING_FAILURE)
+            .setDescription(message)
+            .build();
+    return GenericBuildEvent.protoChaining(this).setAborted(failure).build();
   }
 }