Internal change

PiperOrigin-RevId: 914780082

Author: aCombray

src/java/com/google/devtools/mobileharness/infra/client/api/util/stub/BUILD

@@ -115,6 +115,8 @@ java_library(
         "//src/devtools/mobileharness/shared/util/comm/relay/proto:destination_java_proto",
         "//src/java/com/google/devtools/mobileharness/api/model/lab:locator",
         "//src/java/com/google/devtools/mobileharness/infra/client/api/mode/remote:lab_server_locator",
+        "//src/java/com/google/devtools/mobileharness/shared/util/comm/dualconduit/proxy:server_type",
+        "//src/java/com/google/devtools/mobileharness/shared/util/comm/dualconduit/proxy:util",
         "//src/java/com/google/devtools/mobileharness/shared/util/flags",
     ],
 )

src/java/com/google/devtools/mobileharness/infra/client/api/util/stub/StubUtils.java

@@ -22,6 +22,8 @@
 import com.google.devtools.mobileharness.api.model.proto.Lab;
 import com.google.devtools.mobileharness.infra.client.api.mode.remote.LabServerLocator;
 import com.google.devtools.mobileharness.infra.container.proto.TestEngine;
+import com.google.devtools.mobileharness.shared.util.comm.dualconduit.proxy.DualConduitUtil;
+import com.google.devtools.mobileharness.shared.util.comm.dualconduit.proxy.ServerType;
 import com.google.devtools.mobileharness.shared.util.comm.relay.proto.DestinationProto.TestEngineLocator;
 import com.google.devtools.mobileharness.shared.util.flags.Flags;
 
@@ -33,6 +35,10 @@ public static String getLabServerGrpcTarget(Lab.LabLocator labLocator) {
   }
 
   public static String getLabServerGrpcTarget(LabServerLocator labServerLocator) {
+    if (Flags.useDconXdsAddress.getNonNull() && DualConduitUtil.isXdsBootstrapped()) {
+      return DualConduitUtil.getDualConduitXdsAddress(
+          ServerType.LAB_SERVER, labServerLocator.hostName());
+    }
     if (Flags.connectToLabServerUsingIp.getNonNull()) {
       if (Flags.connectToLabServerUsingMasterDetectedIp.getNonNull()
           && labServerLocator.masterDetectedIp().isPresent()) {
@@ -66,6 +72,11 @@ public static String getTestEngineGrpcTarget(TestEngineLocator testEngineLocator
 
   private static String getTestEngineGrpcTarget(
       String masterDetectedIp, TestEngine.TestEngineLocator testEngineLocator) {
+    if (Flags.useDconXdsAddress.getNonNull()
+        && DualConduitUtil.isXdsBootstrapped()
+        && testEngineLocator.getEnableDualConduit()) {
+      return testEngineLocator.getDualConduitLocator().getXdsAddress();
+    }
     if (Flags.connectToLabServerUsingIp.getNonNull()
         && Flags.connectToLabServerUsingMasterDetectedIp.getNonNull()) {
       return getGrpcTargetByIp(masterDetectedIp, testEngineLocator.getGrpcLocator().getGrpcPort());
@@ -75,6 +86,11 @@ private static String getTestEngineGrpcTarget(
   }
 
   private static String getTestEngineGrpcTarget(TestEngine.TestEngineLocator testEngineLocator) {
+    if (Flags.useDconXdsAddress.getNonNull()
+        && DualConduitUtil.isXdsBootstrapped()
+        && testEngineLocator.getEnableDualConduit()) {
+      return testEngineLocator.getDualConduitLocator().getXdsAddress();
+    }
     if (Flags.connectToLabServerUsingIp.getNonNull()) {
       return getGrpcTargetByIp(
           testEngineLocator.getGrpcLocator().getHostIp(),

src/java/com/google/devtools/mobileharness/infra/lab/rpc/service/PrepareTestServiceImpl.java

@@ -412,8 +412,10 @@ private TestEngineLocator getProxiedTestEngineLocator() throws MobileHarnessExce
     if (!Strings.isNullOrEmpty(dconDialerAddress)) {
       String xdsAddress =
           DualConduitUtil.getDualConduitXdsAddress(ServerType.LAB_SERVER, getInstanceId());
-      builder.setDualConduitLocator(
-          TestEngineLocator.DualConduitLocator.newBuilder().setXdsAddress(xdsAddress).build());
+      builder
+          .setDualConduitLocator(
+              TestEngineLocator.DualConduitLocator.newBuilder().setXdsAddress(xdsAddress).build())
+          .setEnableDualConduit(true);
     }
     GrpcLocator.Builder grpcLocator =
         GrpcLocator.newBuilder()

src/java/com/google/devtools/mobileharness/shared/util/comm/dualconduit/proxy/BUILD

@@ -47,5 +47,6 @@ java_library(
     srcs = ["DualConduitUtil.java"],
     deps = [
         ":server_type",
+        "@maven//:com_google_guava_guava",
     ],
 )

src/java/com/google/devtools/mobileharness/shared/util/comm/dualconduit/proxy/DualConduitUtil.java

@@ -16,9 +16,22 @@
 
 package com.google.devtools.mobileharness.shared.util.comm.dualconduit.proxy;
 
+import com.google.common.annotations.VisibleForTesting;
+import java.util.Objects;
+
 /** Utility class for DualConduit. */
 public class DualConduitUtil {
 
+  @SuppressWarnings("NonFinalStaticField")
+  @VisibleForTesting
+  static boolean isXdsBootstrapped =
+      Objects.equals(System.getenv("GRPC_XDS_BOOTSTRAP"), "/etc/grpc/bootstrap.json");
+
+  /** Returns whether gRPC xDS is configured with the expected bootstrap file. */
+  public static boolean isXdsBootstrapped() {
+    return isXdsBootstrapped;
+  }
+
   /**
    * Returns the xDS address of a server for DualConduit.
    *

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

@@ -1533,6 +1533,13 @@ private static String getTmpDirRootDefaultOss() {
       help = "Use ALTS for OLC server auth.This is supported by GCP vm. The default is false.")
   public static final Flag<Boolean> useAlts = Flag.value(false);
 
+  @FlagSpec(
+      name = "use_dcon_xds_address",
+      help =
+          "Whether to use xDS addresses exposed by Dual Conduit for gRPC communication with Lab"
+              + " Servers and Test Engines. Default is false.")
+  public static final Flag<Boolean> useDconXdsAddress = Flag.value(false);
+
   @FlagSpec(
       name = "use_emulator_name_in_uuid",
       help =