Make --bep_publish_used_heap_size_post_build work for query and other non-build commands. Since we want BEP to support query anyway, enabling this flag on query allows it to be a drop-in replacement for --experimental_force_gc_after_build.

PiperOrigin-RevId: 380256260

Author: janakdr

src/main/java/com/google/devtools/build/lib/metrics/BUILD

@@ -37,6 +37,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions:analysis_graph_stats_event",
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_phase_complete_event",
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_phase_started_event",
+        "//src/main/java/com/google/devtools/build/lib/analysis:no_build_request_finished_event",
         "//src/main/java/com/google/devtools/build/lib/bugreport",
         "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
         "//src/main/java/com/google/devtools/build/lib/clock",

src/main/java/com/google/devtools/build/lib/metrics/MetricsCollector.java

@@ -22,6 +22,7 @@
 import com.google.devtools.build.lib.actions.TotalAndConfiguredTargetOnlyMetric;
 import com.google.devtools.build.lib.analysis.AnalysisPhaseCompleteEvent;
 import com.google.devtools.build.lib.analysis.AnalysisPhaseStartedEvent;
+import com.google.devtools.build.lib.analysis.NoBuildRequestFinishedEvent;
 import com.google.devtools.build.lib.bugreport.BugReport;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildMetrics;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildMetrics.ActionSummary;
@@ -183,6 +184,16 @@ public void onSkyframeGraphStats(SkyframeGraphStatsEvent event) {
   @SuppressWarnings("unused")
   @Subscribe
   public void onBuildComplete(BuildPrecompleteEvent event) {
+    postBuildMetricsEvent();
+  }
+
+  @SuppressWarnings("unused") // Used reflectively
+  @Subscribe
+  public void onNoBuildRequestFinishedEvent(NoBuildRequestFinishedEvent event) {
+    postBuildMetricsEvent();
+  }
+
+  private void postBuildMetricsEvent() {
     env.getEventBus().post(new BuildMetricsEvent(createBuildMetrics()));
   }
 

src/main/java/com/google/devtools/build/lib/metrics/MetricsModule.java

@@ -58,7 +58,7 @@ public static final class Options extends OptionsBase {
 
   @Override
   public Iterable<Class<? extends OptionsBase>> getCommandOptions(Command command) {
-    return "build".equals(command.name()) ? ImmutableList.of(Options.class) : ImmutableList.of();
+    return ImmutableList.of(Options.class);
   }
 
   /**
@@ -74,7 +74,4 @@ public boolean postsBuildMetricsEvent() {
   public void beforeCommand(CommandEnvironment env) {
     MetricsCollector.installInEnv(env, numAnalyses, numBuilds);
   }
-
-  @Override
-  public void afterCommand() {}
 }