Pass the BlazeServices to BlazeModule.globalInit().

Some modules (e.g. BazelFileSystemModule) need to access services before the BlazeRuntime has been constructed. Instead of calling the blazeServicesAvailable() lifecycle method earlier, just merge its responsibilities into globalInit().

PiperOrigin-RevId: 869131080
Change-Id: I7baf11fbe1e0b756d4ffeea0404554b13c207524

Author: tjgq

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

@@ -59,6 +59,7 @@ java_library(
         ":store",
         "//src/main/java/com/google/devtools/build/lib:build-request-options",
         "//src/main/java/com/google/devtools/build/lib:runtime",
+        "//src/main/java/com/google/devtools/build/lib:runtime/blaze_service",
         "//src/main/java/com/google/devtools/build/lib:runtime/command_line_path_factory",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/actions:action_input_helper",

src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java

@@ -82,6 +82,7 @@
 import com.google.devtools.build.lib.runtime.BlazeModule;
 import com.google.devtools.build.lib.runtime.BlazeRuntime;
 import com.google.devtools.build.lib.runtime.BlazeServerStartupOptions;
+import com.google.devtools.build.lib.runtime.BlazeService;
 import com.google.devtools.build.lib.runtime.BlockWaitingModule;
 import com.google.devtools.build.lib.runtime.BuildEventArtifactUploaderFactory;
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
@@ -191,7 +192,8 @@ public ImmutableList<Class<? extends OptionsBase>> getStartupOptions() {
   }
 
   @Override
-  public void globalInit(OptionsParsingResult startupOptions) {
+  public void globalInit(
+      OptionsParsingResult startupOptions, Iterable<BlazeService> blazeServices) {
     outputBase = startupOptions.getOptions(BlazeServerStartupOptions.class).outputBase;
     useRemoteRepoContentsCache =
         startupOptions.getOptions(RemoteStartupOptions.class).useRemoteRepoContentsCache;

src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java

@@ -78,9 +78,11 @@ public Iterable<Class<? extends OptionsBase>> getStartupOptions() {
    * #blazeStartup}.
    *
    * @param startupOptions the server's startup options
+   * @param blazeServices the available services
    * @throws AbruptExitException to shut down the server immediately
    */
-  public void globalInit(OptionsParsingResult startupOptions) throws AbruptExitException {}
+  public void globalInit(OptionsParsingResult startupOptions, Iterable<BlazeService> blazeServices)
+      throws AbruptExitException {}
 
   /**
    * Returns the file system implementation used by Bazel.
@@ -153,15 +155,8 @@ public SubscriberExceptionHandler getEventBusAndAsyncExceptionHandler() {
   }
 
   /**
-   * Called to provide the list of available Blaze services to the module.
-   *
-   * <p>This is called after {@link #getFileSystem} and before {@link #blazeStartup}.
-   */
-  public void blazeServicesAvailable(Iterable<BlazeService> blazeServices) {}
-
-  /**
-   * Called when Bazel starts up after {@link #getStartupOptions}, {@link #globalInit}, {@link
-   * #getFileSystem}, and {@link #blazeServicesAvailable}.
+   * Called when Bazel starts up after {@link #getStartupOptions}, {@link #globalInit} and {@link
+   * #getFileSystem}.
    *
    * @param startupOptions the server's startup options
    * @param versionInfo the Bazel version currently running

src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java

@@ -1352,7 +1352,7 @@ private static BlazeRuntime newRuntime(
     }
 
     for (BlazeModule module : blazeModules) {
-      module.globalInit(options);
+      module.globalInit(options, blazeServices);
     }
 
     String productName = startupOptions.productName.toLowerCase(Locale.US);
@@ -1711,10 +1711,6 @@ public BlazeRuntime build() throws AbruptExitException {
         }
       }
 
-      var blazeServicesCopy = ImmutableList.copyOf(blazeServices);
-      for (BlazeModule module : blazeModules) {
-        module.blazeServicesAvailable(blazeServicesCopy);
-      }
       for (BlazeModule module : blazeModules) {
         module.blazeStartup(
             startupOptionsProvider,