fix(gax): align env var and logging level

Author: westarle

gax-java/gax/src/main/java/com/google/api/gax/logging/LoggingUtils.java

@@ -37,27 +37,16 @@
 public class LoggingUtils {
 
   static final String GOOGLE_SDK_JAVA_LOGGING = "GOOGLE_SDK_JAVA_LOGGING";
-  static final String GOOGLE_SDK_JAVA_LOGGING_V2 = "GOOGLE_SDK_JAVA_LOGGING_V2";
 
   private static boolean loggingEnabled = checkLoggingEnabled(GOOGLE_SDK_JAVA_LOGGING);
-  private static boolean loggingV2Enabled = checkLoggingEnabled(GOOGLE_SDK_JAVA_LOGGING_V2);
 
   /**
-   * Returns whether client-side logging is enabled (V1 or V2).
+   * Returns whether client-side logging is enabled.
    *
    * @return true if logging is enabled, false otherwise.
    */
   public static boolean isLoggingEnabled() {
-    return loggingEnabled || loggingV2Enabled;
-  }
-
-  /**
-   * Returns whether client-side logging V2 (Actionable Errors) is enabled.
-   *
-   * @return true if V2 logging is enabled, false otherwise.
-   */
-  public static boolean isLoggingV2Enabled() {
-    return loggingV2Enabled;
+    return loggingEnabled;
   }
 
   /**
@@ -69,15 +58,6 @@ public static void setLoggingEnabled(boolean enabled) {
     loggingEnabled = enabled;
   }
 
-  /**
-   * Sets whether client-side logging V2 is enabled. Visible for testing.
-   *
-   * @param enabled true to enable logging, false to disable.
-   */
-  public static void setLoggingV2Enabled(boolean enabled) {
-    loggingV2Enabled = enabled;
-  }
-
   private static boolean checkLoggingEnabled(String envVar) {
     String enableLogging = System.getenv(envVar);
     return "true".equalsIgnoreCase(enableLogging);
@@ -179,7 +159,7 @@ public static void logActionableError(
       LoggerProvider loggerProvider,
       org.slf4j.event.Level level,
       String message) {
-    if (loggingV2Enabled) {
+    if (loggingEnabled) {
       org.slf4j.Logger logger = loggerProvider.getLogger();
       Slf4jUtils.log(logger, level, logContext, message);
     }

gax-java/gax/src/main/java/com/google/api/gax/logging/Slf4jLoggingHelpers.java

@@ -114,11 +114,10 @@ static void logResponse(
     LoggingUtils.executeWithTryCatch(
         () -> {
           Logger logger = loggerProvider.getLogger();
-          boolean isV2 = LoggingUtils.isLoggingV2Enabled();
-          if (!isV2 && logger.isInfoEnabled()) {
+          if (logger.isInfoEnabled()) {
             logDataBuilder.responseStatus(status);
           }
-          if (!isV2 && logger.isInfoEnabled() && !logger.isDebugEnabled()) {
+          if (logger.isInfoEnabled() && !logger.isDebugEnabled()) {
             Map<String, Object> responseData = logDataBuilder.build().toMapResponse();
             Slf4jUtils.log(logger, Level.INFO, responseData, "Received response");
           }

gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java

@@ -281,7 +281,7 @@ public static ClientContext create(StubSettings settings) throws IOException {
     if (apiTracerFactory instanceof SpanTracerFactory) {
       apiTracerFactory = apiTracerFactory.withContext(apiTracerContext);
     }
-    if (com.google.api.gax.logging.LoggingUtils.isLoggingV2Enabled()) {
+    if (com.google.api.gax.logging.LoggingUtils.isLoggingEnabled()) {
       com.google.api.gax.tracing.ApiTracerFactory loggingTracerFactory =
           new com.google.api.gax.tracing.LoggingTracerFactory().withContext(apiTracerContext);
       apiTracerFactory =

gax-java/gax/src/main/java/com/google/api/gax/tracing/LoggingTracer.java

@@ -118,6 +118,6 @@ private void recordActionableError(Throwable error) {
 
     String message = error.getMessage() != null ? error.getMessage() : error.getClass().getName();
     LoggingUtils.logActionableError(
-        logContext, LOGGER_PROVIDER, org.slf4j.event.Level.INFO, message);
+        logContext, LOGGER_PROVIDER, org.slf4j.event.Level.DEBUG, message);
   }
 }

gax-java/gax/src/test/java/com/google/api/gax/logging/LoggingUtilsTest.java

@@ -94,11 +94,11 @@ void tearDown() {
 
   @Test
   void testLogActionableError_loggingDisabled() {
-    LoggingUtils.setLoggingV2Enabled(false);
+    LoggingUtils.setLoggingEnabled(false);
     LoggerProvider loggerProvider = mock(LoggerProvider.class);
 
     LoggingUtils.logActionableError(
-        Collections.emptyMap(), loggerProvider, org.slf4j.event.Level.INFO, "message");
+        Collections.emptyMap(), loggerProvider, org.slf4j.event.Level.DEBUG, "message");
 
     verify(loggerProvider, never()).getLogger();
   }
@@ -111,12 +111,13 @@ void testLogActionableError_success() {
     when(loggerProvider.getLogger()).thenReturn(logger);
 
     org.slf4j.spi.LoggingEventBuilder eventBuilder = mock(org.slf4j.spi.LoggingEventBuilder.class);
-    when(logger.atInfo()).thenReturn(eventBuilder);
+    when(logger.atDebug()).thenReturn(eventBuilder);
     when(eventBuilder.addKeyValue(anyString(), any())).thenReturn(eventBuilder);
 
     Map<String, Object> context = Collections.singletonMap("key", "value");
-    LoggingUtils.logActionableError(context, loggerProvider, org.slf4j.event.Level.INFO, "message");
+    LoggingUtils.logActionableError(context, loggerProvider, org.slf4j.event.Level.DEBUG, "message");
 
     verify(loggerProvider).getLogger();
   }
 }
+