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, 7 insertions, 15 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
index 7e8253e244..1c54a6ed6e 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
@@ -192,6 +192,12 @@ message Aborted {
     // Failure due to reasons entirely internal to the build tool, e.g.,
     // running out of memory.
     INTERNAL = 4;
+
+    // A Failure occurred in the loading phase of a target.
+    LOADING_FAILURE = 5;
+
+    // A Failure occurred in the analysis phase of a target.
+    ANALYSIS_FAILURE = 6;
   }
   AbortReason reason = 1;
 
@@ -200,19 +206,6 @@ message Aborted {
   string description = 2;
 }
 
-// Payload of an event indicating that an expected event will not come, as
-// something went wrong when attempting to load the corresponding package.
-message LoadingFailure {
-  string details = 1;
-}
-
-// Payload of an event indicating that an expected event will not come, as
-// something went wrong during analysis. If the analysis of a target failed,
-// the id of the event will be the corresponding TargetCompletedId.
-message AnalysisFailure {
-  string details = 1;
-}
-
 // Payload of an event indicating the beginning of a new build. Usually, events
 // of those type start a new build-event stream. The target pattern requested
 // to be build is contained in one of the announced child events; it is an
@@ -487,14 +480,13 @@ message BuildFinished {
 // that is observed, is provided in the payload. More options for the payload
 // might be added in the future.
 message BuildEvent {
+  reserved 11, 19;
   BuildEventId id = 1;
   repeated BuildEventId children = 2;
   bool last_message = 20;
   oneof payload {
     Progress progress = 3;
     Aborted aborted = 4;
-    LoadingFailure loading_failed = 11;
-    AnalysisFailure analysis_failed = 19;
     BuildStarted started = 5;
     CommandLine command_line = 12;
     OptionsParsed options_parsed = 13;