Move closure of profiler before BlazeRuntime#afterCommand() is ca…

…lled PiperOrigin-RevId: 679269384 Change-Id: I93bbca2126972f3e1fef0addba3575f1fc872161
bazel-io · Sep 26, 2024 · 355b408 · 355b408
1 parent 108f117
commit 355b408
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
@@ -723,13 +723,6 @@ private BlazeCommandResult execExclusively(
       result = BlazeCommandResult.createShutdown(crash);
       return result;
     } finally {
-      if (needToCallAfterCommand) {
-        BlazeCommandResult newResult = runtime.afterCommand(false, env, result);
-        if (!newResult.equals(result)) {
-          logger.atWarning().log("afterCommand yielded different result: %s %s", result, newResult);
-        }
-      }
-
       try {
         Profiler.instance().stop();
         if (profilerStartedEvent.getProfile() instanceof LocalInstrumentationOutput profile) {
@@ -739,8 +732,15 @@ private BlazeCommandResult execExclusively(
         env.getReporter()
             .handle(Event.error("Error while writing profile file: " + e.getMessage()));
       }
-
       Profiler.instance().clear();
+
+      if (needToCallAfterCommand) {
+        BlazeCommandResult newResult = runtime.afterCommand(false, env, result);
+        if (!newResult.equals(result)) {
+          logger.atWarning().log("afterCommand yielded different result: %s %s", result, newResult);
+        }
+      }
+
       MemoryProfiler.instance().stop();
 
       // Swallow IOException, as we are already in a finally clause