Export used gc when memory profiling enabled.

RELNOTES: The used_heap_size_post_build field in BEP is populated when the --memory_profile flag is set
PiperOrigin-RevId: 381924129

Author: janakdr

src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto

@@ -861,8 +861,8 @@ message BuildMetrics {
 
   message MemoryMetrics {
     // Size of the JVM heap post build in bytes. This is only collected if
-    // --bep_publish_used_heap_size_post_build is set,
-    // since it forces a full GC.
+    // --bep_publish_used_heap_size_post_build or --memory_profile is set, since
+    // it forces a full GC.
     int64 used_heap_size_post_build = 1;
 
     // Size of the peak JVM heap size in bytes post GC. Note that this reports 0

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

@@ -40,6 +40,7 @@
 import com.google.devtools.build.lib.clock.BlazeClock.NanosToMillisSinceEpochConverter;
 import com.google.devtools.build.lib.metrics.MetricsModule.Options;
 import com.google.devtools.build.lib.metrics.PostGCMemoryUseRecorder.PeakHeap;
+import com.google.devtools.build.lib.profiler.MemoryProfiler;
 import com.google.devtools.build.lib.profiler.Profiler;
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.runtime.SpawnStats;
@@ -249,6 +250,8 @@ private MemoryMetrics createMemoryMetrics() {
       MemoryMXBean memBean = ManagementFactory.getMemoryMXBean();
       usedHeapSizePostBuild = memBean.getHeapMemoryUsage().getUsed();
       memoryMetrics.setUsedHeapSizePostBuild(usedHeapSizePostBuild);
+    } else if (MemoryProfiler.instance().getHeapUsedMemoryAtFinish() > 0) {
+      memoryMetrics.setUsedHeapSizePostBuild(MemoryProfiler.instance().getHeapUsedMemoryAtFinish());
     }
     PostGCMemoryUseRecorder.get()
         .getPeakPostGcHeap()

src/main/java/com/google/devtools/build/lib/runtime/commands/QueryEnvironmentBasedCommand.java

@@ -21,6 +21,8 @@
 import com.google.devtools.build.lib.analysis.NoBuildRequestFinishedEvent;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.packages.Target;
+import com.google.devtools.build.lib.profiler.ProfilePhase;
+import com.google.devtools.build.lib.profiler.Profiler;
 import com.google.devtools.build.lib.query2.common.AbstractBlazeQueryEnvironment;
 import com.google.devtools.build.lib.query2.common.UniverseScope;
 import com.google.devtools.build.lib.query2.engine.QueryEnvironment;
@@ -83,6 +85,11 @@ public BlazeCommandResult exec(CommandEnvironment env, OptionsParsingResult opti
                 /* showProgress= */ true,
                 /* id= */ null));
     BlazeCommandResult result = execInternal(env, options);
+    try {
+      Profiler.instance().markPhase(ProfilePhase.FINISH);
+    } catch (InterruptedException e) {
+      return reportAndCreateInterruptResult(env, "Profile finish operation interrupted");
+    }
     env.getEventBus()
         .post(
             new NoBuildRequestFinishedEvent(

src/test/shell/bazel/bazel_build_event_stream_test.sh

@@ -92,7 +92,6 @@ EOF
 
 #### TESTS #############################################################
 
-
 function test_fetch_test() {
   # We expect the "fetch" command to generate at least a minimally useful
   # build-event stream.

src/test/shell/integration/build_event_stream_test.sh

@@ -1371,4 +1371,12 @@ EOF
       || fail "Couldn't find top-level named set"
 }
 
+function test_memory_profile() {
+  bazel build --build_event_text_file=bep.txt --memory_profile=/dev/null \
+      >& "$TEST_log" || fail "Expected success"
+  cp bep.txt "$TEST_log" || fail "cp failed"
+  # Non-zero used heap size.
+  expect_log 'used_heap_size_post_build: [1-9]'
+}
+
 run_suite "Integration tests for the build event stream"