1 files changed, 6 insertions, 7 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 c8d957224c..44b19a509e 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
@@ -23,8 +23,6 @@ import com.google.devtools.build.lib.buildeventstream.BuildEventWithConfiguratio
 import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
 import com.google.devtools.build.lib.buildeventstream.NullConfiguration;
 import com.google.devtools.build.lib.buildeventstream.PathConverter;
-import com.google.devtools.build.lib.causes.ActionFailed;
-import com.google.devtools.build.lib.causes.Cause;
 import com.google.devtools.build.lib.vfs.Path;
 import java.util.Collection;
 
@@ -71,12 +69,13 @@ public class ActionExecutedEvent implements BuildEventWithConfiguration {
 
   @Override
   public BuildEventId getEventId() {
-    if (getException() != null) {
-      Cause cause =
-          new ActionFailed(action.getPrimaryOutput().getPath(), action.getOwner().getLabel());
-      return BuildEventId.fromCause(cause);
-    } else {
+    if (action.getOwner() == null) {
       return BuildEventId.actionCompleted(action.getPrimaryOutput().getPath());
+    } else {
+      return BuildEventId.actionCompleted(
+          action.getPrimaryOutput().getPath(),
+          action.getOwner().getLabel(),
+          action.getOwner().getConfigurationChecksum());
     }
   }