diff --git a/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java b/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java index 40e2bd1399..b7f0966027 100644 --- a/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java +++ b/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java @@ -82,7 +82,6 @@ */ @InternalExtensionOnly public final class InstantiatingGrpcChannelProvider implements TransportChannelProvider { - static final String DIRECT_PATH_ENV_VAR = "GOOGLE_CLOUD_ENABLE_DIRECT_PATH"; private static final String DIRECT_PATH_ENV_DISABLE_DIRECT_PATH = "GOOGLE_CLOUD_DISABLE_DIRECT_PATH"; private static final String DIRECT_PATH_ENV_ENABLE_XDS = "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"; @@ -237,9 +236,7 @@ private TransportChannel createChannel() throws IOException { channelPoolSettings, InstantiatingGrpcChannelProvider.this::createSingleChannel)); } - // TODO(mohanli): Use attemptDirectPath as the only indicator once setAttemptDirectPath is adapted - // and the env var is removed from client environment. - private boolean isDirectPathEnabled(String serviceAddress) { + private boolean isDirectPathEnabled() { String disableDirectPathEnv = envProvider.getenv(DIRECT_PATH_ENV_DISABLE_DIRECT_PATH); boolean isDirectPathDisabled = Boolean.parseBoolean(disableDirectPathEnv); if (isDirectPathDisabled) { @@ -249,16 +246,6 @@ private boolean isDirectPathEnabled(String serviceAddress) { if (attemptDirectPath != null) { return attemptDirectPath; } - // Only check DIRECT_PATH_ENV_VAR when attemptDirectPath is not set. - String whiteList = envProvider.getenv(DIRECT_PATH_ENV_VAR); - if (whiteList == null) { - return false; - } - for (String service : whiteList.split(",")) { - if (!service.isEmpty() && serviceAddress.contains(service)) { - return true; - } - } return false; } @@ -318,9 +305,7 @@ private ManagedChannel createSingleChannel() throws IOException { // Check DirectPath traffic. boolean isDirectPathXdsEnabled = false; - if (isDirectPathEnabled(serviceAddress) - && isNonDefaultServiceAccountAllowed() - && isOnComputeEngine()) { + if (isDirectPathEnabled() && isNonDefaultServiceAccountAllowed() && isOnComputeEngine()) { CallCredentials callCreds = MoreCallCredentials.from(credentials); ChannelCredentials channelCreds = GoogleDefaultChannelCredentials.newBuilder().callCredentials(callCreds).build();