Collect local actions metrics by default.

Set `experimental_collect_local_sandbox_action_metrics` and `experimental_collect_local_action_metrics` true by default.

PiperOrigin-RevId: 472947485
Change-Id: Id1253bc35066e003d5005d6a8abf072759af452d

Author: Googler

src/main/java/com/google/devtools/build/lib/exec/local/LocalExecutionOptions.java

@@ -50,14 +50,13 @@ public class LocalExecutionOptions extends OptionsBase {
   public RegexPatternOption allowedLocalAction;
 
   @Option(
-    name = "experimental_collect_local_action_metrics",
-    defaultValue = "false",
-    documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-    effectTags = {OptionEffectTag.EXECUTION},
-    help =
-        "When enabled, execution statistics (such as user and system time) are recorded for "
-            + "locally executed actions which don't use sandboxing"
-  )
+      name = "experimental_collect_local_action_metrics",
+      defaultValue = "true",
+      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+      effectTags = {OptionEffectTag.EXECUTION},
+      help =
+          "When enabled, execution statistics (such as user and system time) are recorded for "
+              + "locally executed actions which don't use sandboxing")
   public boolean collectLocalExecutionStatistics;
 
   @Option(

src/main/java/com/google/devtools/build/lib/sandbox/SandboxOptions.java

@@ -247,7 +247,7 @@ public ImmutableSet<Path> getInaccessiblePaths(FileSystem fs) {
 
   @Option(
       name = "experimental_collect_local_sandbox_action_metrics",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.LOGGING,
       effectTags = {OptionEffectTag.EXECUTION},
       help =

src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java

@@ -382,6 +382,7 @@ public void vanillaZeroExit() throws Exception {
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     options.localSigkillGraceSeconds = 456;
+    options.collectLocalExecutionStatistics = false;
     LocalSpawnRunner runner =
         new TestedLocalSpawnRunner(
             fs.getPath("/execroot"),
@@ -433,6 +434,7 @@ public void testParamFiles() throws Exception {
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     options.localSigkillGraceSeconds = 456;
+    options.collectLocalExecutionStatistics = false;
     Path execRoot = fs.getPath("/execroot");
     LocalSpawnRunner runner =
         new TestedLocalSpawnRunner(
@@ -478,6 +480,7 @@ public void exec_materializesVirtualInputAsExecutable() throws Exception {
     SubprocessBuilder.setDefaultSubprocessFactory(factory);
     Path execRoot = fs.getPath("/execroot");
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
+    options.collectLocalExecutionStatistics = false;
     LocalSpawnRunner runner =
         new TestedLocalSpawnRunner(
             execRoot,
@@ -559,6 +562,7 @@ public void nonZeroExit() throws Exception {
     SubprocessBuilder.setDefaultSubprocessFactory(factory);
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
+    options.collectLocalExecutionStatistics = false;
     LocalSpawnRunner runner =
         new TestedLocalSpawnRunner(
             fs.getPath("/execroot"),
@@ -793,6 +797,7 @@ public void checkPrefetchCalled() throws Exception {
     SubprocessBuilder.setDefaultSubprocessFactory(factory);
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
+    options.collectLocalExecutionStatistics = false;
     LocalSpawnRunner runner =
         new TestedLocalSpawnRunner(
             fs.getPath("/execroot"),
@@ -818,6 +823,7 @@ public void checkNoPrefetchCalled() throws Exception {
     SubprocessBuilder.setDefaultSubprocessFactory(factory);
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
+    options.collectLocalExecutionStatistics = false;
     LocalSpawnRunner runner =
         new TestedLocalSpawnRunner(
             fs.getPath("/execroot"),
@@ -849,6 +855,7 @@ public void checkLocalEnvProviderCalled() throws Exception {
     LocalEnvProvider localEnvProvider = mock(LocalEnvProvider.class);
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
+    options.collectLocalExecutionStatistics = false;
     LocalSpawnRunner runner =
         new TestedLocalSpawnRunner(
             fs.getPath("/execroot"),

src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunnerTest.java

@@ -129,8 +129,7 @@ public void execAsync_spawnRunningBinTool_executesSuccessfully() throws Exceptio
 
   @Test
   public void execAsync_collectsExecutionStatistics() throws Exception {
-    CommandEnvironment commandEnvironment =
-        getCommandEnvironmentWithExecutionStatisticsOptionEnabled("workspace");
+    CommandEnvironment commandEnvironment = createCommandEnvironment();
     LinuxSandboxedSpawnRunner runner = setupSandboxAndCreateRunner(commandEnvironment);
     Path cpuTimeSpenderPath =
         SpawnRunnerTestUtil.copyCpuTimeSpenderIntoPath(commandEnvironment.getExecRoot());
@@ -170,7 +169,8 @@ public void execAsync_collectsExecutionStatistics() throws Exception {
 
   @Test
   public void execAsync_statisticsCollectionDisabled_returnsEmptyStatistics() throws Exception {
-    CommandEnvironment commandEnvironment = createCommandEnvironment();
+    CommandEnvironment commandEnvironment =
+        getCommandEnvironmentWithExecutionStatisticsOptionDisabled("workspace");
     LinuxSandboxedSpawnRunner runner = setupSandboxAndCreateRunner(commandEnvironment);
     Path cpuTimeSpenderPath =
         SpawnRunnerTestUtil.copyCpuTimeSpenderIntoPath(commandEnvironment.getExecRoot());

src/test/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunnerTest.java

@@ -99,9 +99,8 @@ public void hasExecutionStatistics_whenOptionIsEnabled() throws Exception {
     Duration minimumSystemTimeToSpend = Duration.ZERO;
     Duration maximumSystemTimeToSpend = minimumSystemTimeToSpend.plus(Duration.ofSeconds(2));
 
-    CommandEnvironment commandEnvironment =
-        getCommandEnvironmentWithExecutionStatisticsOptionEnabled("workspace");
-
+    CommandEnvironment commandEnvironment = runtimeWrapper.newCommand();
+    commandEnvironment.setWorkspaceName("workspace");
     Path execRoot = commandEnvironment.getExecRoot();
     execRoot.createDirectory();
 
@@ -167,8 +166,8 @@ public void hasNoExecutionStatistics_whenOptionIsDisabled() throws Exception {
     Duration minimumUserTimeToSpend = minimumWallTimeToSpend;
     Duration minimumSystemTimeToSpend = Duration.ZERO;
 
-    CommandEnvironment commandEnvironment = runtimeWrapper.newCommand();
-    commandEnvironment.setWorkspaceName("workspace");
+    CommandEnvironment commandEnvironment =
+        getCommandEnvironmentWithExecutionStatisticsOptionDisabled("workspace");
     commandEnvironment
         .getLocalResourceManager()
         .setAvailableResources(LocalHostCapacity.getLocalHostCapacity());

src/test/java/com/google/devtools/build/lib/sandbox/SandboxedSpawnRunnerTestCase.java

@@ -38,9 +38,9 @@ protected void setupMockTools() throws IOException {
    * Returns a command environment with local execution statistics enabled and the given workspace
    * name set.
    */
-  protected CommandEnvironment getCommandEnvironmentWithExecutionStatisticsOptionEnabled(
+  protected CommandEnvironment getCommandEnvironmentWithExecutionStatisticsOptionDisabled(
       String workspaceName) throws Exception {
-    runtimeWrapper.addOptions("--experimental_collect_local_sandbox_action_metrics");
+    runtimeWrapper.addOptions("--noexperimental_collect_local_sandbox_action_metrics");
     CommandEnvironment env = runtimeWrapper.newCommand();
     env.setWorkspaceName(workspaceName);
     env.getLocalResourceManager().setAvailableResources(LocalHostCapacity.getLocalHostCapacity());