diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ExecutionGraphModule.java b/src/main/java/com/google/devtools/build/lib/runtime/ExecutionGraphModule.java index 049eb7f2828231..9cbb7f597fee83 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/ExecutionGraphModule.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/ExecutionGraphModule.java @@ -154,22 +154,6 @@ public static class ExecutionGraphOptions extends OptionsBase { help = "Subscribe to ActionMiddlemanEvent in ExecutionGraphModule.") public boolean logMiddlemanActions; - @Option( - name = "experimental_execution_graph_log_cached", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = {OptionEffectTag.UNKNOWN}, - defaultValue = "true", - help = "Subscribe to CachedActionEvent in ExecutionGraphModule.") - public boolean logCachedActions; - - @Option( - name = "experimental_execution_graph_log_missed", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = {OptionEffectTag.UNKNOWN}, - defaultValue = "true", - help = "Subscribe to ActionCompletionEvent in ExecutionGraphModule.") - public boolean logMissedActions; - @Option( name = "experimental_execution_graph_enable_edges_from_filewrite_actions", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, @@ -321,10 +305,8 @@ public void discoverInputs(DiscoveredInputsEvent event) { @AllowConcurrentEvents public void actionComplete(ActionCompletionEvent event) { // TODO(vanja): handle finish time in ActionCompletionEvent - if (options.logMissedActions) { - actionEvent( - event.getAction(), event.getRelativeActionStartTimeNanos(), event.getFinishTimeNanos()); - } + actionEvent( + event.getAction(), event.getRelativeActionStartTimeNanos(), event.getFinishTimeNanos()); } /** @@ -335,9 +317,7 @@ public void actionComplete(ActionCompletionEvent event) { @Subscribe @AllowConcurrentEvents public void actionCached(CachedActionEvent event) { - if (options.logCachedActions) { - actionEvent(event.getAction(), event.getNanoTimeStart(), event.getNanoTimeFinish()); - } + actionEvent(event.getAction(), event.getNanoTimeStart(), event.getNanoTimeFinish()); } /** diff --git a/src/test/java/com/google/devtools/build/lib/runtime/ExecutionGraphModuleTest.java b/src/test/java/com/google/devtools/build/lib/runtime/ExecutionGraphModuleTest.java index 3e880bee337f90..a9b5cb1bf9ff31 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/ExecutionGraphModuleTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/ExecutionGraphModuleTest.java @@ -407,7 +407,6 @@ public void spawnAndAction_withSameOutputs() throws Exception { var buffer = new ByteArrayOutputStream(); startLogging(eventBus, UUID.randomUUID(), buffer, DependencyInfo.ALL); var options = new ExecutionGraphModule.ExecutionGraphOptions(); - options.logMissedActions = true; module.setOptions(options); module.spawnExecuted( @@ -438,7 +437,6 @@ public void spawnAndAction_withDifferentOutputs() throws Exception { var buffer = new ByteArrayOutputStream(); startLogging(eventBus, UUID.randomUUID(), buffer, DependencyInfo.ALL); var options = new ExecutionGraphModule.ExecutionGraphOptions(); - options.logMissedActions = true; module.setOptions(options); var nanosToMillis = BlazeClock.createNanosToMillisSinceEpochConverter(); module.setNanosToMillis(nanosToMillis);