fix: Decrease log level for directpath warnings outside GCE

Author: nimf

gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java

@@ -441,43 +441,47 @@ public boolean isDirectPathXdsEnabled() {
   // builder or createSingleChannel, only in getTransportChannel which creates the first channel
   // for a client.
   private void logDirectPathMisconfig() {
-    if (isDirectPathXdsEnabled()) {
-      if (!isDirectPathEnabled()) {
-        // This misconfiguration occurs when Direct Path xDS is enabled, but Direct Path is not
-        // Direct Path xDS can be enabled two ways: via environment variable or via builder.
-        // Case 1: Direct Path is only enabled via xDS env var. We will _warn_ the user that this is
-        // a misconfiguration if they intended to set the env var.
-        if (isDirectPathXdsEnabledViaEnv()) {
-          LOG.log(
-              Level.WARNING,
-              "Env var "
-                  + DIRECT_PATH_ENV_ENABLE_XDS
-                  + " was found and set to TRUE, but DirectPath was not enabled for this client. If this is intended for "
-                  + "this client, please note that this is a misconfiguration and set the attemptDirectPath option as well.");
-        }
-        // Case 2: Direct Path xDS was enabled via Builder. Direct Path Traffic Director must be set
-        // (enabled with `setAttemptDirectPath(true)`) along with xDS.
-        // Here we warn the user about this.
-        else if (isDirectPathXdsEnabledViaBuilderOption()) {
-          LOG.log(
-              Level.WARNING,
-              "DirectPath is misconfigured. The DirectPath XDS option was set, but the attemptDirectPath option was not. Please set both the attemptDirectPath and attemptDirectPathXds options.");
-        }
-      } else {
-        // Case 3: credential is not correctly set
-        if (!isCredentialDirectPathCompatible()) {
-          LOG.log(
-              Level.WARNING,
-              "DirectPath is misconfigured. Please make sure the credential is an instance of "
-                  + ComputeEngineCredentials.class.getName()
-                  + " .");
-        }
-        // Case 4: not running on GCE
-        if (!isOnComputeEngine()) {
-          LOG.log(
-              Level.WARNING,
-              "DirectPath is misconfigured. DirectPath is only available in a GCE environment.");
-        }
+    if (!isDirectPathXdsEnabled()) {
+      return;
+    }
+
+    Level level = isOnComputeEngine() ? Level.WARNING : Level.FINE;
+
+    if (!isDirectPathEnabled()) {
+      // This misconfiguration occurs when Direct Path xDS is enabled, but Direct Path is not
+      // Direct Path xDS can be enabled two ways: via environment variable or via builder.
+      // Case 1: Direct Path is only enabled via xDS env var. We will _warn_ the user that this is
+      // a misconfiguration if they intended to set the env var.
+      if (isDirectPathXdsEnabledViaEnv()) {
+        LOG.log(
+            level,
+            "Env var "
+                + DIRECT_PATH_ENV_ENABLE_XDS
+                + " was found and set to TRUE, but DirectPath was not enabled for this client. If this is intended for "
+                + "this client, please note that this is a misconfiguration and set the attemptDirectPath option as well.");
+      }
+      // Case 2: Direct Path xDS was enabled via Builder. Direct Path Traffic Director must be set
+      // (enabled with `setAttemptDirectPath(true)`) along with xDS.
+      // Here we warn the user about this.
+      else if (isDirectPathXdsEnabledViaBuilderOption()) {
+        LOG.log(
+            level,
+            "DirectPath is misconfigured. The DirectPath XDS option was set, but the attemptDirectPath option was not. Please set both the attemptDirectPath and attemptDirectPathXds options.");
+      }
+    } else {
+      // Case 3: credential is not correctly set
+      if (!isCredentialDirectPathCompatible()) {
+        LOG.log(
+            level,
+            "DirectPath is misconfigured. Please make sure the credential is an instance of "
+                + ComputeEngineCredentials.class.getName()
+                + " .");
+      }
+      // Case 4: not running on GCE
+      if (!isOnComputeEngine()) {
+        LOG.log(
+            level,
+            "DirectPath is misconfigured. DirectPath is only available in a GCE environment.");
       }
     }
   }

gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java

@@ -77,6 +77,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.logging.Handler;
+import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
@@ -645,13 +646,16 @@ private void createAndCloseTransportChannel(InstantiatingGrpcChannelProvider pro
       testLogDirectPathMisconfig_AttemptDirectPathNotSetAndAttemptDirectPathXdsSetViaBuilder_warns()
           throws Exception {
     FakeLogHandler logHandler = new FakeLogHandler();
+    InstantiatingGrpcChannelProvider.LOG.setLevel(Level.FINE);
     InstantiatingGrpcChannelProvider.LOG.addHandler(logHandler);
     InstantiatingGrpcChannelProvider provider =
         createChannelProviderBuilderForDirectPathLogTests()
             .setAttemptDirectPathXds()
             .setCertificateBasedAccess(certificateBasedAccess)
             .build();
+
     createAndCloseTransportChannel(provider);
+
     assertThat(logHandler.getAllMessages())
         .contains(
             "DirectPath is misconfigured. The DirectPath XDS option was set, but the attemptDirectPath option was not. Please set both the attemptDirectPath and attemptDirectPathXds options.");
@@ -662,13 +666,16 @@ private void createAndCloseTransportChannel(InstantiatingGrpcChannelProvider pro
   void testLogDirectPathMisconfig_AttemptDirectPathNotSetAndAttemptDirectPathXdsSetViaEnv_warns()
       throws Exception {
     FakeLogHandler logHandler = new FakeLogHandler();
+    InstantiatingGrpcChannelProvider.LOG.setLevel(Level.FINE);
     InstantiatingGrpcChannelProvider.LOG.addHandler(logHandler);
 
     InstantiatingGrpcChannelProvider provider =
         createChannelProviderBuilderForDirectPathLogTests()
             .setCertificateBasedAccess(certificateBasedAccess)
             .build();
+
     createAndCloseTransportChannel(provider);
+
     assertThat(logHandler.getAllMessages())
         .contains(
             "Env var GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS was found and set to TRUE, but DirectPath was not enabled for this client. If this is intended for "
@@ -679,7 +686,9 @@ void testLogDirectPathMisconfig_AttemptDirectPathNotSetAndAttemptDirectPathXdsSe
   @Test
   void testLogDirectPathMisconfig_shouldNotLogInTheBuilder() {
     FakeLogHandler logHandler = new FakeLogHandler();
+    InstantiatingGrpcChannelProvider.LOG.setLevel(Level.FINE);
     InstantiatingGrpcChannelProvider.LOG.addHandler(logHandler);
+
     InstantiatingGrpcChannelProvider.newBuilder()
         .setAttemptDirectPathXds()
         .setAttemptDirectPath(true)
@@ -693,6 +702,7 @@ void testLogDirectPathMisconfig_shouldNotLogInTheBuilder() {
   @Test
   void testLogDirectPathMisconfigWrongCredential() throws Exception {
     FakeLogHandler logHandler = new FakeLogHandler();
+    InstantiatingGrpcChannelProvider.LOG.setLevel(Level.FINE);
     InstantiatingGrpcChannelProvider.LOG.addHandler(logHandler);
     InstantiatingGrpcChannelProvider provider =
         InstantiatingGrpcChannelProvider.newBuilder()
@@ -719,6 +729,7 @@ void testLogDirectPathMisconfigWrongCredential() throws Exception {
   @Test
   void testLogDirectPathMisconfigNotOnGCE() throws Exception {
     FakeLogHandler logHandler = new FakeLogHandler();
+    InstantiatingGrpcChannelProvider.LOG.setLevel(Level.FINE);
     InstantiatingGrpcChannelProvider.LOG.addHandler(logHandler);
     InstantiatingGrpcChannelProvider provider =
         InstantiatingGrpcChannelProvider.newBuilder()