Internal change

PiperOrigin-RevId: 840553980

Author: DeviceInfra

src/java/com/google/devtools/mobileharness/service/deviceconfig/Annotations.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.devtools.mobileharness.service.deviceconfig;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import javax.inject.Qualifier;
+
+/** Annotations for the config server. */
+public final class Annotations {
+
+  /** Annotation for binding the server port. */
+  @Qualifier
+  @Retention(RetentionPolicy.RUNTIME)
+  public @interface ServerPort {}
+
+  private Annotations() {}
+}

src/java/com/google/devtools/mobileharness/service/deviceconfig/BUILD

@@ -24,19 +24,30 @@ java_library(
     name = "device_config_module",
     srcs = ["DeviceConfigModule.java"],
     deps = [
+        ":annotations",
         "//src/java/com/google/devtools/mobileharness/service/deviceconfig/storage:local_file_storage_client",
         "//src/java/com/google/devtools/mobileharness/service/deviceconfig/storage:storage_client",
+        "//src/java/com/google/devtools/mobileharness/shared/util/flags",
         "@maven//:com_google_inject_guice",
+        "@maven//:javax_inject_jsr330_api",
     ],
 )
 
+java_library(
+    name = "annotations",
+    srcs = ["Annotations.java"],
+    deps = ["@maven//:javax_inject_jsr330_api"],
+)
+
 java_library(
     name = "device_config_server_lib",
     srcs = ["DeviceConfigServer.java"],
     runtime_deps = ["@grpc-java//netty"],
     deps = [
+        ":annotations",
         ":device_config_module",
         "//src/java/com/google/devtools/mobileharness/service/deviceconfig/rpc/service/grpc:device_config_grpc_impl",
+        "//src/java/com/google/devtools/mobileharness/shared/util/flags",
         "//src/java/com/google/devtools/mobileharness/shared/util/logging:google_logger",
         "@grpc-java//core",
         "@grpc-java//services:reflection",

src/java/com/google/devtools/mobileharness/service/deviceconfig/DeviceConfigModule.java

@@ -18,7 +18,10 @@
 
 import com.google.devtools.mobileharness.service.deviceconfig.storage.LocalFileStorageClient;
 import com.google.devtools.mobileharness.service.deviceconfig.storage.StorageClient;
+import com.google.devtools.mobileharness.shared.util.flags.Flags;
 import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import javax.inject.Singleton;
 
 /** The Guice module for device config service. */
 public class DeviceConfigModule extends AbstractModule {
@@ -28,4 +31,11 @@ protected void configure() {
     // TODO: b/460296020 - Add a flag to control which storage client to use.
     bind(StorageClient.class).to(LocalFileStorageClient.class);
   }
+
+  @Provides
+  @Singleton
+  @Annotations.ServerPort
+  int provideServerPort() {
+    return Flags.instance().configServiceGrpcPort.getNonNull();
+  }
 }

src/java/com/google/devtools/mobileharness/service/deviceconfig/DeviceConfigServer.java

@@ -18,6 +18,7 @@
 
 import com.google.common.flogger.FluentLogger;
 import com.google.devtools.mobileharness.service.deviceconfig.rpc.service.grpc.DeviceConfigGrpcImpl;
+import com.google.devtools.mobileharness.shared.util.flags.Flags;
 import com.google.inject.Guice;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
@@ -27,28 +28,27 @@
 
 /** The starter of the DeviceConfigServer. */
 final class DeviceConfigServer {
-  // TODO: b/460296020 - use a flag to specify the port.
-  private static final Integer CONFIG_SERVER_GRPC_PORT = 10000;
-
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
+  private final int port;
   private final DeviceConfigGrpcImpl deviceConfigService;
   private volatile Server grpcServer;
 
   @Inject
-  DeviceConfigServer(DeviceConfigGrpcImpl deviceConfigService) {
+  DeviceConfigServer(DeviceConfigGrpcImpl deviceConfigService, @Annotations.ServerPort int port) {
     this.deviceConfigService = deviceConfigService;
+    this.port = port;
   }
 
   /** Starts the device config server and blocks until it's terminated. */
   public void start() throws IOException {
     grpcServer =
-        ServerBuilder.forPort(CONFIG_SERVER_GRPC_PORT)
+        ServerBuilder.forPort(port)
             .addService(deviceConfigService)
             .addService(ProtoReflectionService.newInstance())
             .build();
     grpcServer.start();
-    logger.atInfo().log("Device config server started on port %d", CONFIG_SERVER_GRPC_PORT);
+    logger.atInfo().log("Device config server started on port %d", port);
 
     Runtime.getRuntime().addShutdownHook(new Thread(this::stop));
   }
@@ -69,6 +69,8 @@ private void blockUntilShutdown() throws InterruptedException {
   }
 
   public static void main(String[] args) throws InterruptedException, IOException {
+    Flags.parse(args);
+
     DeviceConfigServer deviceConfigServer =
         Guice.createInjector(new DeviceConfigModule()).getInstance(DeviceConfigServer.class);
     deviceConfigServer.start();

src/java/com/google/devtools/mobileharness/shared/util/flags/Flags.java

@@ -626,6 +626,14 @@ public class Flags {
       converter = Flag.IntegerConverter.class)
   public Flag<Integer> commandPort = commandPortDefault;
 
+  private static final Flag<Integer> configServiceGrpcPortDefault = Flag.value(8081);
+
+  @com.beust.jcommander.Parameter(
+      names = "--config_service_grpc_port",
+      description = "gRPC port of the config service.",
+      converter = Flag.IntegerConverter.class)
+  public Flag<Integer> configServiceGrpcPort = configServiceGrpcPortDefault;
+
   private static final Flag<Boolean> connectToLabServerUsingIpDefault = Flag.value(false);
 
   @com.beust.jcommander.Parameter(