commit 5d66721ec4e7aab6bdfe47b1d74389bcac86c538
author janakr <janakr@google.com> Fri Apr 03 10:45:41 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Apr 03 10:46:42 2020 -0700
tree 33184e22bd850308641a0f12839dd0e7f4e899ab
parent 9d5474cc8e8a8d868498d673f24e3e44173a497c

Add failure_detail field to Build Event Stream proto's ActionExecuted and TargetComplete events. The detail is taken from the DetailedExitCode object attached to an ActionExecutionException (so detail may not be set).

PiperOrigin-RevId: 304647718

src/main/java/com/google/devtools/build/lib/util/DetailedExitCode.java

diff --git a/src/main/java/com/google/devtools/build/lib/util/DetailedExitCode.java b/src/main/java/com/google/devtools/build/lib/util/DetailedExitCode.java
index 75d8643..6e43c3b 100644
--- a/src/main/java/com/google/devtools/build/lib/util/DetailedExitCode.java
+++ b/src/main/java/com/google/devtools/build/lib/util/DetailedExitCode.java
@@ -22,6 +22,7 @@
 import com.google.protobuf.Descriptors.EnumValueDescriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import com.google.protobuf.MessageOrBuilder;
+import java.util.Comparator;
 import java.util.Map;
 import javax.annotation.Nullable;
 
@@ -168,4 +169,37 @@
         failureDetail);
     return (EnumValueDescriptor) fieldNumberOneVal;
   }
+
+  /**
+   * A comparator to determine the reporting priority of {@link DetailedExitCode}.
+   *
+   * <p>Priority: infrastructure exit codes > non-infrastructure exit codes > null exit codes, with
+   * exit codes that contain failure details taking priority within each class.
+   */
+  public static class DetailedExitCodeComparator implements Comparator<DetailedExitCode> {
+    public static final DetailedExitCodeComparator INSTANCE = new DetailedExitCodeComparator();
+
+    private DetailedExitCodeComparator() {}
+
+    @Nullable
+    public static DetailedExitCode chooseMoreImportantWithFirstIfTie(
+        @Nullable DetailedExitCode first, @Nullable DetailedExitCode second) {
+      return INSTANCE.compare(first, second) >= 0 ? first : second;
+    }
+
+    @Override
+    public int compare(DetailedExitCode c1, DetailedExitCode c2) {
+      // returns POSITIVE result when the priority of c1 is HIGHER than the priority of c2
+      return getPriority(c1) - getPriority(c2);
+    }
+
+    private static int getPriority(DetailedExitCode code) {
+      if (code == null) {
+        return 0;
+      } else {
+        int codeClass = code.getExitCode().isInfrastructureFailure() ? 4 : 2;
+        return codeClass + (code.getFailureDetail() != null ? 1 : 0);
+      }
+    }
+  }
 }