From 57b75a428f29b88adca40191f9703509e3d91353 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 29 Nov 2022 21:06:58 +0000
Subject: [PATCH 1/6] feat: degrade logging level to trace

---
 .../generator/spring/utils/LoggerUtils.java   |   2 +-
 .../EchoSpringAutoConfigurationFull.golden    | 103 ++++++++---------
 .../EchoSpringAutoConfigurationGrpc.golden    | 103 ++++++++---------
 ...EchoSpringAutoConfigurationGrpcRest.golden | 105 +++++++++---------
 4 files changed, 158 insertions(+), 155 deletions(-)

diff --git a/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
index ac888768a2..a5ea4209a0 100644
--- a/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
+++ b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
@@ -75,7 +75,7 @@ public static ExprStatement createLoggerStatement(Expr value, Map<String, TypeNo
     MethodInvocationExpr loggerCallExpr =
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(VariableExpr.withVariable(loggerVariable))
-            .setMethodName("info")
+            .setMethodName("trace")
             .setArguments(value)
             .build();
     return ExprStatement.withExpr(loggerCallExpr);
diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
index b973414fc1..2a8b2962c9 100644
--- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
+++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
@@ -121,7 +121,7 @@ public class EchoSpringAutoConfiguration {
             .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
-      LOGGER.info(
+      LOGGER.trace(
           "Quota project id set to "
               + this.clientProperties.getQuotaProjectId()
               + ", this overrides project id from credentials.");
@@ -132,7 +132,7 @@ public class EchoSpringAutoConfiguration {
               .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount())
               .build();
       clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider);
-      LOGGER.info(
+      LOGGER.trace(
           "Background executor thread count is " + this.clientProperties.getExecutorThreadCount());
     }
     RetrySettings.Builder echoRetrySettingBuilder =
@@ -140,38 +140,38 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getEchoInitialRetryDelay() != null) {
       echoRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getEchoInitialRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay());
     }
     if (this.clientProperties.getEchoRetryDelayMultiplier() != null) {
       echoRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getEchoRetryDelayMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoRetryDelayMultiplier set to " + this.clientProperties.getEchoRetryDelayMultiplier());
     }
     if (this.clientProperties.getEchoMaxRetryDelay() != null) {
       echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay());
-      LOGGER.info("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
+      LOGGER.trace("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
     }
     if (this.clientProperties.getEchoInitialRpcTimeout() != null) {
       echoRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getEchoInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout());
     }
     if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) {
       echoRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getEchoRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoRpcTimeoutMultiplier set to " + this.clientProperties.getEchoRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getEchoMaxRpcTimeout() != null) {
       echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout());
-      LOGGER.info("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
+      LOGGER.trace("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
     }
     if (this.clientProperties.getEchoTotalTimeout() != null) {
       echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout());
-      LOGGER.info("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
+      LOGGER.trace("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
     }
     clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build());
     RetrySettings.Builder expandRetrySettingBuilder =
@@ -179,40 +179,40 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getExpandInitialRetryDelay() != null) {
       expandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getExpandInitialRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay());
     }
     if (this.clientProperties.getExpandRetryDelayMultiplier() != null) {
       expandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getExpandRetryDelayMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandRetryDelayMultiplier set to "
               + this.clientProperties.getExpandRetryDelayMultiplier());
     }
     if (this.clientProperties.getExpandMaxRetryDelay() != null) {
       expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay());
-      LOGGER.info("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
+      LOGGER.trace("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
     }
     if (this.clientProperties.getExpandInitialRpcTimeout() != null) {
       expandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getExpandInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout());
     }
     if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) {
       expandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getExpandRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandRpcTimeoutMultiplier set to "
               + this.clientProperties.getExpandRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getExpandMaxRpcTimeout() != null) {
       expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout());
-      LOGGER.info("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
+      LOGGER.trace("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
     }
     if (this.clientProperties.getExpandTotalTimeout() != null) {
       expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout());
-      LOGGER.info("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
+      LOGGER.trace("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
     }
     clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build());
     RetrySettings.Builder collectRetrySettingBuilder =
@@ -220,23 +220,24 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollectInitialRpcTimeout() != null) {
       collectRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollectInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollectInitialRpcTimeout set to " + this.clientProperties.getCollectInitialRpcTimeout());
     }
     if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) {
       collectRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollectRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "CollectRpcTimeoutMultiplier set to "
               + this.clientProperties.getCollectRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getCollectMaxRpcTimeout() != null) {
       collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout());
-      LOGGER.info("CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
+      LOGGER.trace(
+          "CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
     }
     if (this.clientProperties.getCollectTotalTimeout() != null) {
       collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout());
-      LOGGER.info("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
+      LOGGER.trace("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
     }
     clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build());
     RetrySettings.Builder chatRetrySettingBuilder =
@@ -244,22 +245,22 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatInitialRpcTimeout() != null) {
       chatRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout());
     }
     if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) {
       chatRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatRpcTimeoutMultiplier set to " + this.clientProperties.getChatRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getChatMaxRpcTimeout() != null) {
       chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout());
-      LOGGER.info("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
+      LOGGER.trace("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
     }
     if (this.clientProperties.getChatTotalTimeout() != null) {
       chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout());
-      LOGGER.info("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
+      LOGGER.trace("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
     }
     clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build());
     RetrySettings.Builder chatAgainRetrySettingBuilder =
@@ -267,27 +268,27 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatAgainInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainInitialRpcTimeout set to "
               + this.clientProperties.getChatAgainInitialRpcTimeout());
     }
     if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) {
       chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatAgainRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainRpcTimeoutMultiplier set to "
               + this.clientProperties.getChatAgainRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getChatAgainMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout());
     }
     if (this.clientProperties.getChatAgainTotalTimeout() != null) {
       chatAgainRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getChatAgainTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout());
     }
     clientSettingsBuilder
@@ -298,47 +299,47 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getPagedExpandInitialRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandInitialRetryDelay set to "
               + this.clientProperties.getPagedExpandInitialRetryDelay());
     }
     if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getPagedExpandRetryDelayMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandRetryDelayMultiplier set to "
               + this.clientProperties.getPagedExpandRetryDelayMultiplier());
     }
     if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setMaxRetryDelay(
           this.clientProperties.getPagedExpandMaxRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandMaxRetryDelay set to " + this.clientProperties.getPagedExpandMaxRetryDelay());
     }
     if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getPagedExpandInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandInitialRpcTimeout set to "
               + this.clientProperties.getPagedExpandInitialRpcTimeout());
     }
     if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandRpcTimeoutMultiplier set to "
               + this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getPagedExpandMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandMaxRpcTimeout set to " + this.clientProperties.getPagedExpandMaxRpcTimeout());
     }
     if (this.clientProperties.getPagedExpandTotalTimeout() != null) {
       pagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getPagedExpandTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout());
     }
     clientSettingsBuilder
@@ -349,28 +350,28 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandInitialRpcTimeout set to "
               + this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
     }
     if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) {
       simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandRpcTimeoutMultiplier set to "
               + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandMaxRpcTimeout set to "
               + this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
     }
     if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getSimplePagedExpandTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandTotalTimeout set to "
               + this.clientProperties.getSimplePagedExpandTotalTimeout());
     }
@@ -382,22 +383,22 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getWaitInitialRpcTimeout() != null) {
       waitRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getWaitInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout());
     }
     if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) {
       waitRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getWaitRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "WaitRpcTimeoutMultiplier set to " + this.clientProperties.getWaitRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getWaitMaxRpcTimeout() != null) {
       waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout());
-      LOGGER.info("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
+      LOGGER.trace("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
     }
     if (this.clientProperties.getWaitTotalTimeout() != null) {
       waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout());
-      LOGGER.info("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
+      LOGGER.trace("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
     }
     clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build());
     RetrySettings.Builder blockRetrySettingBuilder =
@@ -405,23 +406,23 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getBlockInitialRpcTimeout() != null) {
       blockRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getBlockInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout());
     }
     if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) {
       blockRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getBlockRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "BlockRpcTimeoutMultiplier set to "
               + this.clientProperties.getBlockRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getBlockMaxRpcTimeout() != null) {
       blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout());
-      LOGGER.info("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
+      LOGGER.trace("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
     }
     if (this.clientProperties.getBlockTotalTimeout() != null) {
       blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout());
-      LOGGER.info("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
+      LOGGER.trace("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
     }
     clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build());
     RetrySettings.Builder collideNameRetrySettingBuilder =
@@ -429,27 +430,27 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollideNameInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameInitialRpcTimeout set to "
               + this.clientProperties.getCollideNameInitialRpcTimeout());
     }
     if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) {
       collideNameRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollideNameRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameRpcTimeoutMultiplier set to "
               + this.clientProperties.getCollideNameRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getCollideNameMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameMaxRpcTimeout set to " + this.clientProperties.getCollideNameMaxRpcTimeout());
     }
     if (this.clientProperties.getCollideNameTotalTimeout() != null) {
       collideNameRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getCollideNameTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout());
     }
     clientSettingsBuilder
diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
index 4464a4ab01..5b689e7bcc 100644
--- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
+++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
@@ -101,7 +101,7 @@ public class EchoSpringAutoConfiguration {
             .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
-      LOGGER.info(
+      LOGGER.trace(
           "Quota project id set to "
               + this.clientProperties.getQuotaProjectId()
               + ", this overrides project id from credentials.");
@@ -112,7 +112,7 @@ public class EchoSpringAutoConfiguration {
               .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount())
               .build();
       clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider);
-      LOGGER.info(
+      LOGGER.trace(
           "Background executor thread count is " + this.clientProperties.getExecutorThreadCount());
     }
     RetrySettings.Builder echoRetrySettingBuilder =
@@ -120,38 +120,38 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getEchoInitialRetryDelay() != null) {
       echoRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getEchoInitialRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay());
     }
     if (this.clientProperties.getEchoRetryDelayMultiplier() != null) {
       echoRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getEchoRetryDelayMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoRetryDelayMultiplier set to " + this.clientProperties.getEchoRetryDelayMultiplier());
     }
     if (this.clientProperties.getEchoMaxRetryDelay() != null) {
       echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay());
-      LOGGER.info("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
+      LOGGER.trace("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
     }
     if (this.clientProperties.getEchoInitialRpcTimeout() != null) {
       echoRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getEchoInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout());
     }
     if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) {
       echoRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getEchoRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoRpcTimeoutMultiplier set to " + this.clientProperties.getEchoRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getEchoMaxRpcTimeout() != null) {
       echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout());
-      LOGGER.info("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
+      LOGGER.trace("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
     }
     if (this.clientProperties.getEchoTotalTimeout() != null) {
       echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout());
-      LOGGER.info("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
+      LOGGER.trace("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
     }
     clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build());
     RetrySettings.Builder expandRetrySettingBuilder =
@@ -159,40 +159,40 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getExpandInitialRetryDelay() != null) {
       expandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getExpandInitialRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay());
     }
     if (this.clientProperties.getExpandRetryDelayMultiplier() != null) {
       expandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getExpandRetryDelayMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandRetryDelayMultiplier set to "
               + this.clientProperties.getExpandRetryDelayMultiplier());
     }
     if (this.clientProperties.getExpandMaxRetryDelay() != null) {
       expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay());
-      LOGGER.info("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
+      LOGGER.trace("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
     }
     if (this.clientProperties.getExpandInitialRpcTimeout() != null) {
       expandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getExpandInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout());
     }
     if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) {
       expandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getExpandRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandRpcTimeoutMultiplier set to "
               + this.clientProperties.getExpandRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getExpandMaxRpcTimeout() != null) {
       expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout());
-      LOGGER.info("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
+      LOGGER.trace("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
     }
     if (this.clientProperties.getExpandTotalTimeout() != null) {
       expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout());
-      LOGGER.info("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
+      LOGGER.trace("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
     }
     clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build());
     RetrySettings.Builder collectRetrySettingBuilder =
@@ -200,23 +200,24 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollectInitialRpcTimeout() != null) {
       collectRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollectInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollectInitialRpcTimeout set to " + this.clientProperties.getCollectInitialRpcTimeout());
     }
     if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) {
       collectRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollectRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "CollectRpcTimeoutMultiplier set to "
               + this.clientProperties.getCollectRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getCollectMaxRpcTimeout() != null) {
       collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout());
-      LOGGER.info("CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
+      LOGGER.trace(
+          "CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
     }
     if (this.clientProperties.getCollectTotalTimeout() != null) {
       collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout());
-      LOGGER.info("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
+      LOGGER.trace("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
     }
     clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build());
     RetrySettings.Builder chatRetrySettingBuilder =
@@ -224,22 +225,22 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatInitialRpcTimeout() != null) {
       chatRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout());
     }
     if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) {
       chatRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatRpcTimeoutMultiplier set to " + this.clientProperties.getChatRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getChatMaxRpcTimeout() != null) {
       chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout());
-      LOGGER.info("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
+      LOGGER.trace("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
     }
     if (this.clientProperties.getChatTotalTimeout() != null) {
       chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout());
-      LOGGER.info("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
+      LOGGER.trace("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
     }
     clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build());
     RetrySettings.Builder chatAgainRetrySettingBuilder =
@@ -247,27 +248,27 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatAgainInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainInitialRpcTimeout set to "
               + this.clientProperties.getChatAgainInitialRpcTimeout());
     }
     if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) {
       chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatAgainRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainRpcTimeoutMultiplier set to "
               + this.clientProperties.getChatAgainRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getChatAgainMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout());
     }
     if (this.clientProperties.getChatAgainTotalTimeout() != null) {
       chatAgainRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getChatAgainTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout());
     }
     clientSettingsBuilder
@@ -278,47 +279,47 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getPagedExpandInitialRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandInitialRetryDelay set to "
               + this.clientProperties.getPagedExpandInitialRetryDelay());
     }
     if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getPagedExpandRetryDelayMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandRetryDelayMultiplier set to "
               + this.clientProperties.getPagedExpandRetryDelayMultiplier());
     }
     if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setMaxRetryDelay(
           this.clientProperties.getPagedExpandMaxRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandMaxRetryDelay set to " + this.clientProperties.getPagedExpandMaxRetryDelay());
     }
     if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getPagedExpandInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandInitialRpcTimeout set to "
               + this.clientProperties.getPagedExpandInitialRpcTimeout());
     }
     if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandRpcTimeoutMultiplier set to "
               + this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getPagedExpandMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandMaxRpcTimeout set to " + this.clientProperties.getPagedExpandMaxRpcTimeout());
     }
     if (this.clientProperties.getPagedExpandTotalTimeout() != null) {
       pagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getPagedExpandTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout());
     }
     clientSettingsBuilder
@@ -329,28 +330,28 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandInitialRpcTimeout set to "
               + this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
     }
     if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) {
       simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandRpcTimeoutMultiplier set to "
               + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandMaxRpcTimeout set to "
               + this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
     }
     if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getSimplePagedExpandTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandTotalTimeout set to "
               + this.clientProperties.getSimplePagedExpandTotalTimeout());
     }
@@ -362,22 +363,22 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getWaitInitialRpcTimeout() != null) {
       waitRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getWaitInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout());
     }
     if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) {
       waitRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getWaitRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "WaitRpcTimeoutMultiplier set to " + this.clientProperties.getWaitRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getWaitMaxRpcTimeout() != null) {
       waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout());
-      LOGGER.info("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
+      LOGGER.trace("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
     }
     if (this.clientProperties.getWaitTotalTimeout() != null) {
       waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout());
-      LOGGER.info("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
+      LOGGER.trace("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
     }
     clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build());
     RetrySettings.Builder blockRetrySettingBuilder =
@@ -385,23 +386,23 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getBlockInitialRpcTimeout() != null) {
       blockRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getBlockInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout());
     }
     if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) {
       blockRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getBlockRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "BlockRpcTimeoutMultiplier set to "
               + this.clientProperties.getBlockRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getBlockMaxRpcTimeout() != null) {
       blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout());
-      LOGGER.info("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
+      LOGGER.trace("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
     }
     if (this.clientProperties.getBlockTotalTimeout() != null) {
       blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout());
-      LOGGER.info("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
+      LOGGER.trace("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
     }
     clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build());
     RetrySettings.Builder collideNameRetrySettingBuilder =
@@ -409,27 +410,27 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollideNameInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameInitialRpcTimeout set to "
               + this.clientProperties.getCollideNameInitialRpcTimeout());
     }
     if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) {
       collideNameRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollideNameRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameRpcTimeoutMultiplier set to "
               + this.clientProperties.getCollideNameRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getCollideNameMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameMaxRpcTimeout set to " + this.clientProperties.getCollideNameMaxRpcTimeout());
     }
     if (this.clientProperties.getCollideNameTotalTimeout() != null) {
       collideNameRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getCollideNameTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout());
     }
     clientSettingsBuilder
diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
index 9ce9e54996..5999a9f4c1 100644
--- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
+++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
@@ -102,7 +102,7 @@ public class EchoSpringAutoConfiguration {
             .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
-      LOGGER.info(
+      LOGGER.trace(
           "Quota project id set to "
               + this.clientProperties.getQuotaProjectId()
               + ", this overrides project id from credentials.");
@@ -113,51 +113,51 @@ public class EchoSpringAutoConfiguration {
               .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount())
               .build();
       clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider);
-      LOGGER.info(
+      LOGGER.trace(
           "Background executor thread count is " + this.clientProperties.getExecutorThreadCount());
     }
     if (this.clientProperties.getUseRest()) {
       clientSettingsBuilder.setTransportChannelProvider(
           EchoSettings.defaultHttpJsonTransportProviderBuilder().build());
-      LOGGER.info("Using HTTP transport channel");
+      LOGGER.trace("Using HTTP transport channel");
     }
     RetrySettings.Builder echoRetrySettingBuilder =
         clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder();
     if (this.clientProperties.getEchoInitialRetryDelay() != null) {
       echoRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getEchoInitialRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay());
     }
     if (this.clientProperties.getEchoRetryDelayMultiplier() != null) {
       echoRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getEchoRetryDelayMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoRetryDelayMultiplier set to " + this.clientProperties.getEchoRetryDelayMultiplier());
     }
     if (this.clientProperties.getEchoMaxRetryDelay() != null) {
       echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay());
-      LOGGER.info("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
+      LOGGER.trace("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
     }
     if (this.clientProperties.getEchoInitialRpcTimeout() != null) {
       echoRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getEchoInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout());
     }
     if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) {
       echoRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getEchoRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "EchoRpcTimeoutMultiplier set to " + this.clientProperties.getEchoRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getEchoMaxRpcTimeout() != null) {
       echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout());
-      LOGGER.info("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
+      LOGGER.trace("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
     }
     if (this.clientProperties.getEchoTotalTimeout() != null) {
       echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout());
-      LOGGER.info("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
+      LOGGER.trace("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
     }
     clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build());
     RetrySettings.Builder expandRetrySettingBuilder =
@@ -165,40 +165,40 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getExpandInitialRetryDelay() != null) {
       expandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getExpandInitialRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay());
     }
     if (this.clientProperties.getExpandRetryDelayMultiplier() != null) {
       expandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getExpandRetryDelayMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandRetryDelayMultiplier set to "
               + this.clientProperties.getExpandRetryDelayMultiplier());
     }
     if (this.clientProperties.getExpandMaxRetryDelay() != null) {
       expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay());
-      LOGGER.info("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
+      LOGGER.trace("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
     }
     if (this.clientProperties.getExpandInitialRpcTimeout() != null) {
       expandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getExpandInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout());
     }
     if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) {
       expandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getExpandRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ExpandRpcTimeoutMultiplier set to "
               + this.clientProperties.getExpandRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getExpandMaxRpcTimeout() != null) {
       expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout());
-      LOGGER.info("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
+      LOGGER.trace("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
     }
     if (this.clientProperties.getExpandTotalTimeout() != null) {
       expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout());
-      LOGGER.info("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
+      LOGGER.trace("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
     }
     clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build());
     RetrySettings.Builder collectRetrySettingBuilder =
@@ -206,23 +206,24 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollectInitialRpcTimeout() != null) {
       collectRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollectInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollectInitialRpcTimeout set to " + this.clientProperties.getCollectInitialRpcTimeout());
     }
     if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) {
       collectRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollectRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "CollectRpcTimeoutMultiplier set to "
               + this.clientProperties.getCollectRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getCollectMaxRpcTimeout() != null) {
       collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout());
-      LOGGER.info("CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
+      LOGGER.trace(
+          "CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
     }
     if (this.clientProperties.getCollectTotalTimeout() != null) {
       collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout());
-      LOGGER.info("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
+      LOGGER.trace("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
     }
     clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build());
     RetrySettings.Builder chatRetrySettingBuilder =
@@ -230,22 +231,22 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatInitialRpcTimeout() != null) {
       chatRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout());
     }
     if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) {
       chatRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatRpcTimeoutMultiplier set to " + this.clientProperties.getChatRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getChatMaxRpcTimeout() != null) {
       chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout());
-      LOGGER.info("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
+      LOGGER.trace("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
     }
     if (this.clientProperties.getChatTotalTimeout() != null) {
       chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout());
-      LOGGER.info("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
+      LOGGER.trace("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
     }
     clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build());
     RetrySettings.Builder chatAgainRetrySettingBuilder =
@@ -253,27 +254,27 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatAgainInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainInitialRpcTimeout set to "
               + this.clientProperties.getChatAgainInitialRpcTimeout());
     }
     if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) {
       chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatAgainRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainRpcTimeoutMultiplier set to "
               + this.clientProperties.getChatAgainRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getChatAgainMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout());
     }
     if (this.clientProperties.getChatAgainTotalTimeout() != null) {
       chatAgainRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getChatAgainTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout());
     }
     clientSettingsBuilder
@@ -284,47 +285,47 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getPagedExpandInitialRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandInitialRetryDelay set to "
               + this.clientProperties.getPagedExpandInitialRetryDelay());
     }
     if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getPagedExpandRetryDelayMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandRetryDelayMultiplier set to "
               + this.clientProperties.getPagedExpandRetryDelayMultiplier());
     }
     if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setMaxRetryDelay(
           this.clientProperties.getPagedExpandMaxRetryDelay());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandMaxRetryDelay set to " + this.clientProperties.getPagedExpandMaxRetryDelay());
     }
     if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getPagedExpandInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandInitialRpcTimeout set to "
               + this.clientProperties.getPagedExpandInitialRpcTimeout());
     }
     if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandRpcTimeoutMultiplier set to "
               + this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getPagedExpandMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandMaxRpcTimeout set to " + this.clientProperties.getPagedExpandMaxRpcTimeout());
     }
     if (this.clientProperties.getPagedExpandTotalTimeout() != null) {
       pagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getPagedExpandTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout());
     }
     clientSettingsBuilder
@@ -335,28 +336,28 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandInitialRpcTimeout set to "
               + this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
     }
     if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) {
       simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandRpcTimeoutMultiplier set to "
               + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandMaxRpcTimeout set to "
               + this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
     }
     if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getSimplePagedExpandTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "SimplePagedExpandTotalTimeout set to "
               + this.clientProperties.getSimplePagedExpandTotalTimeout());
     }
@@ -368,22 +369,22 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getWaitInitialRpcTimeout() != null) {
       waitRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getWaitInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout());
     }
     if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) {
       waitRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getWaitRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "WaitRpcTimeoutMultiplier set to " + this.clientProperties.getWaitRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getWaitMaxRpcTimeout() != null) {
       waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout());
-      LOGGER.info("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
+      LOGGER.trace("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
     }
     if (this.clientProperties.getWaitTotalTimeout() != null) {
       waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout());
-      LOGGER.info("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
+      LOGGER.trace("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
     }
     clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build());
     RetrySettings.Builder blockRetrySettingBuilder =
@@ -391,23 +392,23 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getBlockInitialRpcTimeout() != null) {
       blockRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getBlockInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout());
     }
     if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) {
       blockRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getBlockRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "BlockRpcTimeoutMultiplier set to "
               + this.clientProperties.getBlockRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getBlockMaxRpcTimeout() != null) {
       blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout());
-      LOGGER.info("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
+      LOGGER.trace("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
     }
     if (this.clientProperties.getBlockTotalTimeout() != null) {
       blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout());
-      LOGGER.info("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
+      LOGGER.trace("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
     }
     clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build());
     RetrySettings.Builder collideNameRetrySettingBuilder =
@@ -415,27 +416,27 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollideNameInitialRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameInitialRpcTimeout set to "
               + this.clientProperties.getCollideNameInitialRpcTimeout());
     }
     if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) {
       collideNameRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollideNameRpcTimeoutMultiplier());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameRpcTimeoutMultiplier set to "
               + this.clientProperties.getCollideNameRpcTimeoutMultiplier());
     }
     if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getCollideNameMaxRpcTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameMaxRpcTimeout set to " + this.clientProperties.getCollideNameMaxRpcTimeout());
     }
     if (this.clientProperties.getCollideNameTotalTimeout() != null) {
       collideNameRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getCollideNameTotalTimeout());
-      LOGGER.info(
+      LOGGER.trace(
           "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout());
     }
     clientSettingsBuilder

From 7084f76339f8adfbe1950c1652d96df268b4bdcf Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 29 Nov 2022 22:06:43 +0000
Subject: [PATCH 2/6] feat: wrap logging with `isTraceEnabled()`

---
 .../SpringAutoConfigClassComposer.java        |   4 +-
 .../generator/spring/utils/LoggerUtils.java   |  15 +-
 .../EchoSpringAutoConfigurationFull.golden    | 328 +++++++++++------
 .../EchoSpringAutoConfigurationGrpc.golden    | 328 +++++++++++------
 ...EchoSpringAutoConfigurationGrpcRest.golden | 332 ++++++++++++------
 5 files changed, 681 insertions(+), 326 deletions(-)

diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
index 2b67625693..581a1025ac 100644
--- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
+++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
@@ -643,7 +643,7 @@ private static MethodDefinition createClientBeanMethod(
             .setArguments(getQuotaProjectId)
             .build();
 
-    ExprStatement projectIdLoggerStatement =
+    IfStatement projectIdLoggerStatement =
         LoggerUtils.createLoggerStatement(
             LoggerUtils.concatManyWithExprs(
                 ValueExpr.withValue(StringObjectValue.withValue("Quota project id set to ")),
@@ -714,7 +714,7 @@ private static MethodDefinition createClientBeanMethod(
             .setArguments(executorProviderVarExpr)
             .build();
 
-    ExprStatement backgroundExecutorLoggerStatement =
+    IfStatement backgroundExecutorLoggerStatement =
         LoggerUtils.createLoggerStatement(
             ArithmeticOperationExpr.concatWithExprs(
                 ValueExpr.withValue(
diff --git a/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
index a5ea4209a0..721359d3bc 100644
--- a/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
+++ b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
@@ -19,6 +19,7 @@
 import com.google.api.generator.engine.ast.ConcreteReference;
 import com.google.api.generator.engine.ast.Expr;
 import com.google.api.generator.engine.ast.ExprStatement;
+import com.google.api.generator.engine.ast.IfStatement;
 import com.google.api.generator.engine.ast.MethodInvocationExpr;
 import com.google.api.generator.engine.ast.ScopeNode;
 import com.google.api.generator.engine.ast.Statement;
@@ -69,7 +70,7 @@ public static Statement getLoggerDeclarationExpr(String className, Map<String, T
     return ExprStatement.withExpr(loggerAssignmentExpr);
   }
 
-  public static ExprStatement createLoggerStatement(Expr value, Map<String, TypeNode> types) {
+  public static IfStatement createLoggerStatement(Expr value, Map<String, TypeNode> types) {
     Variable loggerVariable =
         Variable.builder().setName("LOGGER").setType(STATIC_TYPES.get("Log")).build();
     MethodInvocationExpr loggerCallExpr =
@@ -78,7 +79,17 @@ public static ExprStatement createLoggerStatement(Expr value, Map<String, TypeNo
             .setMethodName("trace")
             .setArguments(value)
             .build();
-    return ExprStatement.withExpr(loggerCallExpr);
+    IfStatement loggerStatement =
+        IfStatement.builder()
+            .setConditionExpr(
+                MethodInvocationExpr.builder()
+                    .setExprReferenceExpr(VariableExpr.withVariable(loggerVariable))
+                    .setMethodName("isTraceEnabled")
+                    .setReturnType(TypeNode.BOOLEAN)
+                    .build())
+            .setBody(Arrays.asList(ExprStatement.withExpr(loggerCallExpr)))
+            .build();
+    return loggerStatement;
   }
 
   public static Expr concatManyWithExprs(Expr... exprs) {
diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
index 2a8b2962c9..47206c66f4 100644
--- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
+++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
@@ -121,10 +121,12 @@ public class EchoSpringAutoConfiguration {
             .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
-      LOGGER.trace(
-          "Quota project id set to "
-              + this.clientProperties.getQuotaProjectId()
-              + ", this overrides project id from credentials.");
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Quota project id set to "
+                + this.clientProperties.getQuotaProjectId()
+                + ", this overrides project id from credentials.");
+      }
     }
     if (this.clientProperties.getExecutorThreadCount() != null) {
       ExecutorProvider executorProvider =
@@ -132,46 +134,65 @@ public class EchoSpringAutoConfiguration {
               .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount())
               .build();
       clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider);
-      LOGGER.trace(
-          "Background executor thread count is " + this.clientProperties.getExecutorThreadCount());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Background executor thread count is "
+                + this.clientProperties.getExecutorThreadCount());
+      }
     }
     RetrySettings.Builder echoRetrySettingBuilder =
         clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder();
     if (this.clientProperties.getEchoInitialRetryDelay() != null) {
       echoRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getEchoInitialRetryDelay());
-      LOGGER.trace(
-          "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay());
+      }
     }
     if (this.clientProperties.getEchoRetryDelayMultiplier() != null) {
       echoRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getEchoRetryDelayMultiplier());
-      LOGGER.trace(
-          "EchoRetryDelayMultiplier set to " + this.clientProperties.getEchoRetryDelayMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoRetryDelayMultiplier set to "
+                + this.clientProperties.getEchoRetryDelayMultiplier());
+      }
     }
     if (this.clientProperties.getEchoMaxRetryDelay() != null) {
       echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay());
-      LOGGER.trace("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
+      }
     }
     if (this.clientProperties.getEchoInitialRpcTimeout() != null) {
       echoRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getEchoInitialRpcTimeout());
-      LOGGER.trace(
-          "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) {
       echoRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getEchoRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "EchoRpcTimeoutMultiplier set to " + this.clientProperties.getEchoRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoRpcTimeoutMultiplier set to "
+                + this.clientProperties.getEchoRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getEchoMaxRpcTimeout() != null) {
       echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout());
-      LOGGER.trace("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getEchoTotalTimeout() != null) {
       echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout());
-      LOGGER.trace("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
+      }
     }
     clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build());
     RetrySettings.Builder expandRetrySettingBuilder =
@@ -179,40 +200,56 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getExpandInitialRetryDelay() != null) {
       expandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getExpandInitialRetryDelay());
-      LOGGER.trace(
-          "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay());
+      }
     }
     if (this.clientProperties.getExpandRetryDelayMultiplier() != null) {
       expandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getExpandRetryDelayMultiplier());
-      LOGGER.trace(
-          "ExpandRetryDelayMultiplier set to "
-              + this.clientProperties.getExpandRetryDelayMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandRetryDelayMultiplier set to "
+                + this.clientProperties.getExpandRetryDelayMultiplier());
+      }
     }
     if (this.clientProperties.getExpandMaxRetryDelay() != null) {
       expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay());
-      LOGGER.trace("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
+      }
     }
     if (this.clientProperties.getExpandInitialRpcTimeout() != null) {
       expandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getExpandInitialRpcTimeout());
-      LOGGER.trace(
-          "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) {
       expandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getExpandRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "ExpandRpcTimeoutMultiplier set to "
-              + this.clientProperties.getExpandRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandRpcTimeoutMultiplier set to "
+                + this.clientProperties.getExpandRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getExpandMaxRpcTimeout() != null) {
       expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout());
-      LOGGER.trace("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getExpandTotalTimeout() != null) {
       expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout());
-      LOGGER.trace("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
+      }
     }
     clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build());
     RetrySettings.Builder collectRetrySettingBuilder =
@@ -220,24 +257,34 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollectInitialRpcTimeout() != null) {
       collectRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollectInitialRpcTimeout());
-      LOGGER.trace(
-          "CollectInitialRpcTimeout set to " + this.clientProperties.getCollectInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectInitialRpcTimeout set to "
+                + this.clientProperties.getCollectInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) {
       collectRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollectRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "CollectRpcTimeoutMultiplier set to "
-              + this.clientProperties.getCollectRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectRpcTimeoutMultiplier set to "
+                + this.clientProperties.getCollectRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getCollectMaxRpcTimeout() != null) {
       collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout());
-      LOGGER.trace(
-          "CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollectTotalTimeout() != null) {
       collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout());
-      LOGGER.trace("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
+      }
     }
     clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build());
     RetrySettings.Builder chatRetrySettingBuilder =
@@ -245,22 +292,31 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatInitialRpcTimeout() != null) {
       chatRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatInitialRpcTimeout());
-      LOGGER.trace(
-          "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) {
       chatRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "ChatRpcTimeoutMultiplier set to " + this.clientProperties.getChatRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatRpcTimeoutMultiplier set to "
+                + this.clientProperties.getChatRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getChatMaxRpcTimeout() != null) {
       chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout());
-      LOGGER.trace("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatTotalTimeout() != null) {
       chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout());
-      LOGGER.trace("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
+      }
     }
     clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build());
     RetrySettings.Builder chatAgainRetrySettingBuilder =
@@ -268,28 +324,36 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatAgainInitialRpcTimeout());
-      LOGGER.trace(
-          "ChatAgainInitialRpcTimeout set to "
-              + this.clientProperties.getChatAgainInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainInitialRpcTimeout set to "
+                + this.clientProperties.getChatAgainInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) {
       chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatAgainRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "ChatAgainRpcTimeoutMultiplier set to "
-              + this.clientProperties.getChatAgainRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainRpcTimeoutMultiplier set to "
+                + this.clientProperties.getChatAgainRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getChatAgainMaxRpcTimeout());
-      LOGGER.trace(
-          "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatAgainTotalTimeout() != null) {
       chatAgainRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getChatAgainTotalTimeout());
-      LOGGER.trace(
-          "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .chatAgainSettings()
@@ -299,48 +363,64 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getPagedExpandInitialRetryDelay());
-      LOGGER.trace(
-          "PagedExpandInitialRetryDelay set to "
-              + this.clientProperties.getPagedExpandInitialRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandInitialRetryDelay set to "
+                + this.clientProperties.getPagedExpandInitialRetryDelay());
+      }
     }
     if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getPagedExpandRetryDelayMultiplier());
-      LOGGER.trace(
-          "PagedExpandRetryDelayMultiplier set to "
-              + this.clientProperties.getPagedExpandRetryDelayMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandRetryDelayMultiplier set to "
+                + this.clientProperties.getPagedExpandRetryDelayMultiplier());
+      }
     }
     if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setMaxRetryDelay(
           this.clientProperties.getPagedExpandMaxRetryDelay());
-      LOGGER.trace(
-          "PagedExpandMaxRetryDelay set to " + this.clientProperties.getPagedExpandMaxRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandMaxRetryDelay set to "
+                + this.clientProperties.getPagedExpandMaxRetryDelay());
+      }
     }
     if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getPagedExpandInitialRpcTimeout());
-      LOGGER.trace(
-          "PagedExpandInitialRpcTimeout set to "
-              + this.clientProperties.getPagedExpandInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandInitialRpcTimeout set to "
+                + this.clientProperties.getPagedExpandInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "PagedExpandRpcTimeoutMultiplier set to "
-              + this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandRpcTimeoutMultiplier set to "
+                + this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getPagedExpandMaxRpcTimeout());
-      LOGGER.trace(
-          "PagedExpandMaxRpcTimeout set to " + this.clientProperties.getPagedExpandMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandMaxRpcTimeout set to "
+                + this.clientProperties.getPagedExpandMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getPagedExpandTotalTimeout() != null) {
       pagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getPagedExpandTotalTimeout());
-      LOGGER.trace(
-          "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .pagedExpandSettings()
@@ -350,30 +430,38 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
-      LOGGER.trace(
-          "SimplePagedExpandInitialRpcTimeout set to "
-              + this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandInitialRpcTimeout set to "
+                + this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) {
       simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "SimplePagedExpandRpcTimeoutMultiplier set to "
-              + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandRpcTimeoutMultiplier set to "
+                + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
-      LOGGER.trace(
-          "SimplePagedExpandMaxRpcTimeout set to "
-              + this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandMaxRpcTimeout set to "
+                + this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getSimplePagedExpandTotalTimeout());
-      LOGGER.trace(
-          "SimplePagedExpandTotalTimeout set to "
-              + this.clientProperties.getSimplePagedExpandTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandTotalTimeout set to "
+                + this.clientProperties.getSimplePagedExpandTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .simplePagedExpandSettings()
@@ -383,22 +471,31 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getWaitInitialRpcTimeout() != null) {
       waitRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getWaitInitialRpcTimeout());
-      LOGGER.trace(
-          "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) {
       waitRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getWaitRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "WaitRpcTimeoutMultiplier set to " + this.clientProperties.getWaitRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "WaitRpcTimeoutMultiplier set to "
+                + this.clientProperties.getWaitRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getWaitMaxRpcTimeout() != null) {
       waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout());
-      LOGGER.trace("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getWaitTotalTimeout() != null) {
       waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout());
-      LOGGER.trace("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
+      }
     }
     clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build());
     RetrySettings.Builder blockRetrySettingBuilder =
@@ -406,23 +503,31 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getBlockInitialRpcTimeout() != null) {
       blockRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getBlockInitialRpcTimeout());
-      LOGGER.trace(
-          "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) {
       blockRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getBlockRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "BlockRpcTimeoutMultiplier set to "
-              + this.clientProperties.getBlockRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "BlockRpcTimeoutMultiplier set to "
+                + this.clientProperties.getBlockRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getBlockMaxRpcTimeout() != null) {
       blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout());
-      LOGGER.trace("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getBlockTotalTimeout() != null) {
       blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout());
-      LOGGER.trace("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
+      }
     }
     clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build());
     RetrySettings.Builder collideNameRetrySettingBuilder =
@@ -430,28 +535,37 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollideNameInitialRpcTimeout());
-      LOGGER.trace(
-          "CollideNameInitialRpcTimeout set to "
-              + this.clientProperties.getCollideNameInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameInitialRpcTimeout set to "
+                + this.clientProperties.getCollideNameInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) {
       collideNameRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollideNameRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "CollideNameRpcTimeoutMultiplier set to "
-              + this.clientProperties.getCollideNameRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameRpcTimeoutMultiplier set to "
+                + this.clientProperties.getCollideNameRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getCollideNameMaxRpcTimeout());
-      LOGGER.trace(
-          "CollideNameMaxRpcTimeout set to " + this.clientProperties.getCollideNameMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameMaxRpcTimeout set to "
+                + this.clientProperties.getCollideNameMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollideNameTotalTimeout() != null) {
       collideNameRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getCollideNameTotalTimeout());
-      LOGGER.trace(
-          "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .collideNameSettings()
diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
index 5b689e7bcc..1dbcf7ba86 100644
--- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
+++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
@@ -101,10 +101,12 @@ public class EchoSpringAutoConfiguration {
             .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
-      LOGGER.trace(
-          "Quota project id set to "
-              + this.clientProperties.getQuotaProjectId()
-              + ", this overrides project id from credentials.");
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Quota project id set to "
+                + this.clientProperties.getQuotaProjectId()
+                + ", this overrides project id from credentials.");
+      }
     }
     if (this.clientProperties.getExecutorThreadCount() != null) {
       ExecutorProvider executorProvider =
@@ -112,46 +114,65 @@ public class EchoSpringAutoConfiguration {
               .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount())
               .build();
       clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider);
-      LOGGER.trace(
-          "Background executor thread count is " + this.clientProperties.getExecutorThreadCount());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Background executor thread count is "
+                + this.clientProperties.getExecutorThreadCount());
+      }
     }
     RetrySettings.Builder echoRetrySettingBuilder =
         clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder();
     if (this.clientProperties.getEchoInitialRetryDelay() != null) {
       echoRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getEchoInitialRetryDelay());
-      LOGGER.trace(
-          "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay());
+      }
     }
     if (this.clientProperties.getEchoRetryDelayMultiplier() != null) {
       echoRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getEchoRetryDelayMultiplier());
-      LOGGER.trace(
-          "EchoRetryDelayMultiplier set to " + this.clientProperties.getEchoRetryDelayMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoRetryDelayMultiplier set to "
+                + this.clientProperties.getEchoRetryDelayMultiplier());
+      }
     }
     if (this.clientProperties.getEchoMaxRetryDelay() != null) {
       echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay());
-      LOGGER.trace("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
+      }
     }
     if (this.clientProperties.getEchoInitialRpcTimeout() != null) {
       echoRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getEchoInitialRpcTimeout());
-      LOGGER.trace(
-          "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) {
       echoRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getEchoRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "EchoRpcTimeoutMultiplier set to " + this.clientProperties.getEchoRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoRpcTimeoutMultiplier set to "
+                + this.clientProperties.getEchoRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getEchoMaxRpcTimeout() != null) {
       echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout());
-      LOGGER.trace("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getEchoTotalTimeout() != null) {
       echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout());
-      LOGGER.trace("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
+      }
     }
     clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build());
     RetrySettings.Builder expandRetrySettingBuilder =
@@ -159,40 +180,56 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getExpandInitialRetryDelay() != null) {
       expandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getExpandInitialRetryDelay());
-      LOGGER.trace(
-          "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay());
+      }
     }
     if (this.clientProperties.getExpandRetryDelayMultiplier() != null) {
       expandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getExpandRetryDelayMultiplier());
-      LOGGER.trace(
-          "ExpandRetryDelayMultiplier set to "
-              + this.clientProperties.getExpandRetryDelayMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandRetryDelayMultiplier set to "
+                + this.clientProperties.getExpandRetryDelayMultiplier());
+      }
     }
     if (this.clientProperties.getExpandMaxRetryDelay() != null) {
       expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay());
-      LOGGER.trace("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
+      }
     }
     if (this.clientProperties.getExpandInitialRpcTimeout() != null) {
       expandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getExpandInitialRpcTimeout());
-      LOGGER.trace(
-          "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) {
       expandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getExpandRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "ExpandRpcTimeoutMultiplier set to "
-              + this.clientProperties.getExpandRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandRpcTimeoutMultiplier set to "
+                + this.clientProperties.getExpandRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getExpandMaxRpcTimeout() != null) {
       expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout());
-      LOGGER.trace("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getExpandTotalTimeout() != null) {
       expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout());
-      LOGGER.trace("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
+      }
     }
     clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build());
     RetrySettings.Builder collectRetrySettingBuilder =
@@ -200,24 +237,34 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollectInitialRpcTimeout() != null) {
       collectRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollectInitialRpcTimeout());
-      LOGGER.trace(
-          "CollectInitialRpcTimeout set to " + this.clientProperties.getCollectInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectInitialRpcTimeout set to "
+                + this.clientProperties.getCollectInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) {
       collectRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollectRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "CollectRpcTimeoutMultiplier set to "
-              + this.clientProperties.getCollectRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectRpcTimeoutMultiplier set to "
+                + this.clientProperties.getCollectRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getCollectMaxRpcTimeout() != null) {
       collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout());
-      LOGGER.trace(
-          "CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollectTotalTimeout() != null) {
       collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout());
-      LOGGER.trace("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
+      }
     }
     clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build());
     RetrySettings.Builder chatRetrySettingBuilder =
@@ -225,22 +272,31 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatInitialRpcTimeout() != null) {
       chatRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatInitialRpcTimeout());
-      LOGGER.trace(
-          "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) {
       chatRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "ChatRpcTimeoutMultiplier set to " + this.clientProperties.getChatRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatRpcTimeoutMultiplier set to "
+                + this.clientProperties.getChatRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getChatMaxRpcTimeout() != null) {
       chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout());
-      LOGGER.trace("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatTotalTimeout() != null) {
       chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout());
-      LOGGER.trace("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
+      }
     }
     clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build());
     RetrySettings.Builder chatAgainRetrySettingBuilder =
@@ -248,28 +304,36 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatAgainInitialRpcTimeout());
-      LOGGER.trace(
-          "ChatAgainInitialRpcTimeout set to "
-              + this.clientProperties.getChatAgainInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainInitialRpcTimeout set to "
+                + this.clientProperties.getChatAgainInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) {
       chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatAgainRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "ChatAgainRpcTimeoutMultiplier set to "
-              + this.clientProperties.getChatAgainRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainRpcTimeoutMultiplier set to "
+                + this.clientProperties.getChatAgainRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getChatAgainMaxRpcTimeout());
-      LOGGER.trace(
-          "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatAgainTotalTimeout() != null) {
       chatAgainRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getChatAgainTotalTimeout());
-      LOGGER.trace(
-          "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .chatAgainSettings()
@@ -279,48 +343,64 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getPagedExpandInitialRetryDelay());
-      LOGGER.trace(
-          "PagedExpandInitialRetryDelay set to "
-              + this.clientProperties.getPagedExpandInitialRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandInitialRetryDelay set to "
+                + this.clientProperties.getPagedExpandInitialRetryDelay());
+      }
     }
     if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getPagedExpandRetryDelayMultiplier());
-      LOGGER.trace(
-          "PagedExpandRetryDelayMultiplier set to "
-              + this.clientProperties.getPagedExpandRetryDelayMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandRetryDelayMultiplier set to "
+                + this.clientProperties.getPagedExpandRetryDelayMultiplier());
+      }
     }
     if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setMaxRetryDelay(
           this.clientProperties.getPagedExpandMaxRetryDelay());
-      LOGGER.trace(
-          "PagedExpandMaxRetryDelay set to " + this.clientProperties.getPagedExpandMaxRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandMaxRetryDelay set to "
+                + this.clientProperties.getPagedExpandMaxRetryDelay());
+      }
     }
     if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getPagedExpandInitialRpcTimeout());
-      LOGGER.trace(
-          "PagedExpandInitialRpcTimeout set to "
-              + this.clientProperties.getPagedExpandInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandInitialRpcTimeout set to "
+                + this.clientProperties.getPagedExpandInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "PagedExpandRpcTimeoutMultiplier set to "
-              + this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandRpcTimeoutMultiplier set to "
+                + this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getPagedExpandMaxRpcTimeout());
-      LOGGER.trace(
-          "PagedExpandMaxRpcTimeout set to " + this.clientProperties.getPagedExpandMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandMaxRpcTimeout set to "
+                + this.clientProperties.getPagedExpandMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getPagedExpandTotalTimeout() != null) {
       pagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getPagedExpandTotalTimeout());
-      LOGGER.trace(
-          "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .pagedExpandSettings()
@@ -330,30 +410,38 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
-      LOGGER.trace(
-          "SimplePagedExpandInitialRpcTimeout set to "
-              + this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandInitialRpcTimeout set to "
+                + this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) {
       simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "SimplePagedExpandRpcTimeoutMultiplier set to "
-              + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandRpcTimeoutMultiplier set to "
+                + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
-      LOGGER.trace(
-          "SimplePagedExpandMaxRpcTimeout set to "
-              + this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandMaxRpcTimeout set to "
+                + this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getSimplePagedExpandTotalTimeout());
-      LOGGER.trace(
-          "SimplePagedExpandTotalTimeout set to "
-              + this.clientProperties.getSimplePagedExpandTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandTotalTimeout set to "
+                + this.clientProperties.getSimplePagedExpandTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .simplePagedExpandSettings()
@@ -363,22 +451,31 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getWaitInitialRpcTimeout() != null) {
       waitRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getWaitInitialRpcTimeout());
-      LOGGER.trace(
-          "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) {
       waitRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getWaitRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "WaitRpcTimeoutMultiplier set to " + this.clientProperties.getWaitRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "WaitRpcTimeoutMultiplier set to "
+                + this.clientProperties.getWaitRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getWaitMaxRpcTimeout() != null) {
       waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout());
-      LOGGER.trace("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getWaitTotalTimeout() != null) {
       waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout());
-      LOGGER.trace("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
+      }
     }
     clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build());
     RetrySettings.Builder blockRetrySettingBuilder =
@@ -386,23 +483,31 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getBlockInitialRpcTimeout() != null) {
       blockRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getBlockInitialRpcTimeout());
-      LOGGER.trace(
-          "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) {
       blockRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getBlockRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "BlockRpcTimeoutMultiplier set to "
-              + this.clientProperties.getBlockRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "BlockRpcTimeoutMultiplier set to "
+                + this.clientProperties.getBlockRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getBlockMaxRpcTimeout() != null) {
       blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout());
-      LOGGER.trace("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getBlockTotalTimeout() != null) {
       blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout());
-      LOGGER.trace("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
+      }
     }
     clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build());
     RetrySettings.Builder collideNameRetrySettingBuilder =
@@ -410,28 +515,37 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollideNameInitialRpcTimeout());
-      LOGGER.trace(
-          "CollideNameInitialRpcTimeout set to "
-              + this.clientProperties.getCollideNameInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameInitialRpcTimeout set to "
+                + this.clientProperties.getCollideNameInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) {
       collideNameRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollideNameRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "CollideNameRpcTimeoutMultiplier set to "
-              + this.clientProperties.getCollideNameRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameRpcTimeoutMultiplier set to "
+                + this.clientProperties.getCollideNameRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getCollideNameMaxRpcTimeout());
-      LOGGER.trace(
-          "CollideNameMaxRpcTimeout set to " + this.clientProperties.getCollideNameMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameMaxRpcTimeout set to "
+                + this.clientProperties.getCollideNameMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollideNameTotalTimeout() != null) {
       collideNameRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getCollideNameTotalTimeout());
-      LOGGER.trace(
-          "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .collideNameSettings()
diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
index 5999a9f4c1..4b99155848 100644
--- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
+++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
@@ -102,10 +102,12 @@ public class EchoSpringAutoConfiguration {
             .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
-      LOGGER.trace(
-          "Quota project id set to "
-              + this.clientProperties.getQuotaProjectId()
-              + ", this overrides project id from credentials.");
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Quota project id set to "
+                + this.clientProperties.getQuotaProjectId()
+                + ", this overrides project id from credentials.");
+      }
     }
     if (this.clientProperties.getExecutorThreadCount() != null) {
       ExecutorProvider executorProvider =
@@ -113,51 +115,72 @@ public class EchoSpringAutoConfiguration {
               .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount())
               .build();
       clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider);
-      LOGGER.trace(
-          "Background executor thread count is " + this.clientProperties.getExecutorThreadCount());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Background executor thread count is "
+                + this.clientProperties.getExecutorThreadCount());
+      }
     }
     if (this.clientProperties.getUseRest()) {
       clientSettingsBuilder.setTransportChannelProvider(
           EchoSettings.defaultHttpJsonTransportProviderBuilder().build());
-      LOGGER.trace("Using HTTP transport channel");
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Using HTTP transport channel");
+      }
     }
     RetrySettings.Builder echoRetrySettingBuilder =
         clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder();
     if (this.clientProperties.getEchoInitialRetryDelay() != null) {
       echoRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getEchoInitialRetryDelay());
-      LOGGER.trace(
-          "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay());
+      }
     }
     if (this.clientProperties.getEchoRetryDelayMultiplier() != null) {
       echoRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getEchoRetryDelayMultiplier());
-      LOGGER.trace(
-          "EchoRetryDelayMultiplier set to " + this.clientProperties.getEchoRetryDelayMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoRetryDelayMultiplier set to "
+                + this.clientProperties.getEchoRetryDelayMultiplier());
+      }
     }
     if (this.clientProperties.getEchoMaxRetryDelay() != null) {
       echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay());
-      LOGGER.trace("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay());
+      }
     }
     if (this.clientProperties.getEchoInitialRpcTimeout() != null) {
       echoRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getEchoInitialRpcTimeout());
-      LOGGER.trace(
-          "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) {
       echoRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getEchoRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "EchoRpcTimeoutMultiplier set to " + this.clientProperties.getEchoRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "EchoRpcTimeoutMultiplier set to "
+                + this.clientProperties.getEchoRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getEchoMaxRpcTimeout() != null) {
       echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout());
-      LOGGER.trace("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getEchoTotalTimeout() != null) {
       echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout());
-      LOGGER.trace("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout());
+      }
     }
     clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build());
     RetrySettings.Builder expandRetrySettingBuilder =
@@ -165,40 +188,56 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getExpandInitialRetryDelay() != null) {
       expandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getExpandInitialRetryDelay());
-      LOGGER.trace(
-          "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay());
+      }
     }
     if (this.clientProperties.getExpandRetryDelayMultiplier() != null) {
       expandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getExpandRetryDelayMultiplier());
-      LOGGER.trace(
-          "ExpandRetryDelayMultiplier set to "
-              + this.clientProperties.getExpandRetryDelayMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandRetryDelayMultiplier set to "
+                + this.clientProperties.getExpandRetryDelayMultiplier());
+      }
     }
     if (this.clientProperties.getExpandMaxRetryDelay() != null) {
       expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay());
-      LOGGER.trace("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay());
+      }
     }
     if (this.clientProperties.getExpandInitialRpcTimeout() != null) {
       expandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getExpandInitialRpcTimeout());
-      LOGGER.trace(
-          "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) {
       expandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getExpandRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "ExpandRpcTimeoutMultiplier set to "
-              + this.clientProperties.getExpandRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandRpcTimeoutMultiplier set to "
+                + this.clientProperties.getExpandRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getExpandMaxRpcTimeout() != null) {
       expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout());
-      LOGGER.trace("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getExpandTotalTimeout() != null) {
       expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout());
-      LOGGER.trace("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout());
+      }
     }
     clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build());
     RetrySettings.Builder collectRetrySettingBuilder =
@@ -206,24 +245,34 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollectInitialRpcTimeout() != null) {
       collectRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollectInitialRpcTimeout());
-      LOGGER.trace(
-          "CollectInitialRpcTimeout set to " + this.clientProperties.getCollectInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectInitialRpcTimeout set to "
+                + this.clientProperties.getCollectInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) {
       collectRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollectRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "CollectRpcTimeoutMultiplier set to "
-              + this.clientProperties.getCollectRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectRpcTimeoutMultiplier set to "
+                + this.clientProperties.getCollectRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getCollectMaxRpcTimeout() != null) {
       collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout());
-      LOGGER.trace(
-          "CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollectTotalTimeout() != null) {
       collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout());
-      LOGGER.trace("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout());
+      }
     }
     clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build());
     RetrySettings.Builder chatRetrySettingBuilder =
@@ -231,22 +280,31 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatInitialRpcTimeout() != null) {
       chatRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatInitialRpcTimeout());
-      LOGGER.trace(
-          "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) {
       chatRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "ChatRpcTimeoutMultiplier set to " + this.clientProperties.getChatRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatRpcTimeoutMultiplier set to "
+                + this.clientProperties.getChatRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getChatMaxRpcTimeout() != null) {
       chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout());
-      LOGGER.trace("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatTotalTimeout() != null) {
       chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout());
-      LOGGER.trace("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout());
+      }
     }
     clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build());
     RetrySettings.Builder chatAgainRetrySettingBuilder =
@@ -254,28 +312,36 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getChatAgainInitialRpcTimeout());
-      LOGGER.trace(
-          "ChatAgainInitialRpcTimeout set to "
-              + this.clientProperties.getChatAgainInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainInitialRpcTimeout set to "
+                + this.clientProperties.getChatAgainInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) {
       chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getChatAgainRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "ChatAgainRpcTimeoutMultiplier set to "
-              + this.clientProperties.getChatAgainRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainRpcTimeoutMultiplier set to "
+                + this.clientProperties.getChatAgainRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) {
       chatAgainRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getChatAgainMaxRpcTimeout());
-      LOGGER.trace(
-          "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getChatAgainTotalTimeout() != null) {
       chatAgainRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getChatAgainTotalTimeout());
-      LOGGER.trace(
-          "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .chatAgainSettings()
@@ -285,48 +351,64 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setInitialRetryDelay(
           this.clientProperties.getPagedExpandInitialRetryDelay());
-      LOGGER.trace(
-          "PagedExpandInitialRetryDelay set to "
-              + this.clientProperties.getPagedExpandInitialRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandInitialRetryDelay set to "
+                + this.clientProperties.getPagedExpandInitialRetryDelay());
+      }
     }
     if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRetryDelayMultiplier(
           this.clientProperties.getPagedExpandRetryDelayMultiplier());
-      LOGGER.trace(
-          "PagedExpandRetryDelayMultiplier set to "
-              + this.clientProperties.getPagedExpandRetryDelayMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandRetryDelayMultiplier set to "
+                + this.clientProperties.getPagedExpandRetryDelayMultiplier());
+      }
     }
     if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) {
       pagedExpandRetrySettingBuilder.setMaxRetryDelay(
           this.clientProperties.getPagedExpandMaxRetryDelay());
-      LOGGER.trace(
-          "PagedExpandMaxRetryDelay set to " + this.clientProperties.getPagedExpandMaxRetryDelay());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandMaxRetryDelay set to "
+                + this.clientProperties.getPagedExpandMaxRetryDelay());
+      }
     }
     if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getPagedExpandInitialRpcTimeout());
-      LOGGER.trace(
-          "PagedExpandInitialRpcTimeout set to "
-              + this.clientProperties.getPagedExpandInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandInitialRpcTimeout set to "
+                + this.clientProperties.getPagedExpandInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) {
       pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "PagedExpandRpcTimeoutMultiplier set to "
-              + this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandRpcTimeoutMultiplier set to "
+                + this.clientProperties.getPagedExpandRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) {
       pagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getPagedExpandMaxRpcTimeout());
-      LOGGER.trace(
-          "PagedExpandMaxRpcTimeout set to " + this.clientProperties.getPagedExpandMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandMaxRpcTimeout set to "
+                + this.clientProperties.getPagedExpandMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getPagedExpandTotalTimeout() != null) {
       pagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getPagedExpandTotalTimeout());
-      LOGGER.trace(
-          "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .pagedExpandSettings()
@@ -336,30 +418,38 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
-      LOGGER.trace(
-          "SimplePagedExpandInitialRpcTimeout set to "
-              + this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandInitialRpcTimeout set to "
+                + this.clientProperties.getSimplePagedExpandInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) {
       simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "SimplePagedExpandRpcTimeoutMultiplier set to "
-              + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandRpcTimeoutMultiplier set to "
+                + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
-      LOGGER.trace(
-          "SimplePagedExpandMaxRpcTimeout set to "
-              + this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandMaxRpcTimeout set to "
+                + this.clientProperties.getSimplePagedExpandMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) {
       simplePagedExpandRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getSimplePagedExpandTotalTimeout());
-      LOGGER.trace(
-          "SimplePagedExpandTotalTimeout set to "
-              + this.clientProperties.getSimplePagedExpandTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "SimplePagedExpandTotalTimeout set to "
+                + this.clientProperties.getSimplePagedExpandTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .simplePagedExpandSettings()
@@ -369,22 +459,31 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getWaitInitialRpcTimeout() != null) {
       waitRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getWaitInitialRpcTimeout());
-      LOGGER.trace(
-          "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) {
       waitRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getWaitRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "WaitRpcTimeoutMultiplier set to " + this.clientProperties.getWaitRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "WaitRpcTimeoutMultiplier set to "
+                + this.clientProperties.getWaitRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getWaitMaxRpcTimeout() != null) {
       waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout());
-      LOGGER.trace("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getWaitTotalTimeout() != null) {
       waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout());
-      LOGGER.trace("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout());
+      }
     }
     clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build());
     RetrySettings.Builder blockRetrySettingBuilder =
@@ -392,23 +491,31 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getBlockInitialRpcTimeout() != null) {
       blockRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getBlockInitialRpcTimeout());
-      LOGGER.trace(
-          "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) {
       blockRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getBlockRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "BlockRpcTimeoutMultiplier set to "
-              + this.clientProperties.getBlockRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "BlockRpcTimeoutMultiplier set to "
+                + this.clientProperties.getBlockRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getBlockMaxRpcTimeout() != null) {
       blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout());
-      LOGGER.trace("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getBlockTotalTimeout() != null) {
       blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout());
-      LOGGER.trace("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout());
+      }
     }
     clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build());
     RetrySettings.Builder collideNameRetrySettingBuilder =
@@ -416,28 +523,37 @@ public class EchoSpringAutoConfiguration {
     if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setInitialRpcTimeout(
           this.clientProperties.getCollideNameInitialRpcTimeout());
-      LOGGER.trace(
-          "CollideNameInitialRpcTimeout set to "
-              + this.clientProperties.getCollideNameInitialRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameInitialRpcTimeout set to "
+                + this.clientProperties.getCollideNameInitialRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) {
       collideNameRetrySettingBuilder.setRpcTimeoutMultiplier(
           this.clientProperties.getCollideNameRpcTimeoutMultiplier());
-      LOGGER.trace(
-          "CollideNameRpcTimeoutMultiplier set to "
-              + this.clientProperties.getCollideNameRpcTimeoutMultiplier());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameRpcTimeoutMultiplier set to "
+                + this.clientProperties.getCollideNameRpcTimeoutMultiplier());
+      }
     }
     if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) {
       collideNameRetrySettingBuilder.setMaxRpcTimeout(
           this.clientProperties.getCollideNameMaxRpcTimeout());
-      LOGGER.trace(
-          "CollideNameMaxRpcTimeout set to " + this.clientProperties.getCollideNameMaxRpcTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameMaxRpcTimeout set to "
+                + this.clientProperties.getCollideNameMaxRpcTimeout());
+      }
     }
     if (this.clientProperties.getCollideNameTotalTimeout() != null) {
       collideNameRetrySettingBuilder.setTotalTimeout(
           this.clientProperties.getCollideNameTotalTimeout());
-      LOGGER.trace(
-          "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout());
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout());
+      }
     }
     clientSettingsBuilder
         .collideNameSettings()

From 2f8e6d3cfd2f71261e2395d305d713e78ca833c5 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 29 Nov 2022 22:30:19 +0000
Subject: [PATCH 3/6] feat: credential usage logging

---
 .../SpringAutoConfigClassComposer.java        | 29 +++++++++----------
 .../EchoSpringAutoConfigurationFull.golden    |  6 ++++
 .../EchoSpringAutoConfigurationGrpc.golden    |  6 ++++
 ...EchoSpringAutoConfigurationGrpcRest.golden |  6 ++++
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
index 581a1025ac..7b1992b9ed 100644
--- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
+++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
@@ -386,24 +386,23 @@ private static MethodDefinition createCredentialsProviderBeanMethod(
             .setMethodName("hasKey")
             .setReturnType(TypeNode.BOOLEAN)
             .build();
+    Statement logClientCredentials =
+        LoggerUtils.createLoggerStatement(
+            ValueExpr.withValue(
+                StringObjectValue.withValue(
+                    "Using credentials from " + service.name() + "-specific configuration")),
+            types);
     IfStatement clientCredentialsIfStatement =
         createIfStatement(
-            clientPropertiesCredentialsHasKey, Arrays.asList(clientCredentialsReturnExpr), null);
+            clientPropertiesCredentialsHasKey,
+            Arrays.asList(logClientCredentials, clientCredentialsReturnExpr),
+            null);
     bodyStatements.add(clientCredentialsIfStatement);
-
-    // @ConditionalOnMissingBean(name = "[serviceName]ServiceCredentials")
-    AnnotationNode conditionalOnMissingBeanExpr =
-        AnnotationNode.builder()
-            .setType(STATIC_TYPES.get("ConditionalOnMissingBean"))
-            .addDescription(
-                AssignmentExpr.builder()
-                    .setVariableExpr(
-                        VariableExpr.withVariable(
-                            Variable.builder().setName("name").setType(TypeNode.STRING).build()))
-                    .setValueExpr(ValueExpr.withValue(StringObjectValue.withValue(methodName)))
-                    .build())
-            .build();
-
+    bodyStatements.add(
+        LoggerUtils.createLoggerStatement(
+            ValueExpr.withValue(
+                StringObjectValue.withValue("Using credentials from global configuration")),
+            types));
     return MethodDefinition.builder()
         .setName(methodName)
         .setHeaderCommentStatements(
diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
index 47206c66f4..f742818547 100644
--- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
+++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
@@ -82,8 +82,14 @@ public class EchoSpringAutoConfiguration {
   @ConditionalOnMissingBean
   public CredentialsProvider echoCredentials() throws IOException {
     if (this.clientProperties.getCredentials().hasKey()) {
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Using credentials from Echo-specific configuration");
+      }
       return ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties));
     }
+    if (LOGGER.isTraceEnabled()) {
+      LOGGER.trace("Using credentials from global configuration");
+    }
     return ((CredentialsProvider) new DefaultCredentialsProvider(this.globalProperties));
   }
 
diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
index 1dbcf7ba86..70a77bff70 100644
--- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
+++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
@@ -62,8 +62,14 @@ public class EchoSpringAutoConfiguration {
   @ConditionalOnMissingBean
   public CredentialsProvider echoCredentials() throws IOException {
     if (this.clientProperties.getCredentials().hasKey()) {
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Using credentials from Echo-specific configuration");
+      }
       return ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties));
     }
+    if (LOGGER.isTraceEnabled()) {
+      LOGGER.trace("Using credentials from global configuration");
+    }
     return ((CredentialsProvider) new DefaultCredentialsProvider(this.globalProperties));
   }
 
diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
index 4b99155848..a710b16903 100644
--- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
+++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
@@ -63,8 +63,14 @@ public class EchoSpringAutoConfiguration {
   @ConditionalOnMissingBean
   public CredentialsProvider echoCredentials() throws IOException {
     if (this.clientProperties.getCredentials().hasKey()) {
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Using credentials from Echo-specific configuration");
+      }
       return ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties));
     }
+    if (LOGGER.isTraceEnabled()) {
+      LOGGER.trace("Using credentials from global configuration");
+    }
     return ((CredentialsProvider) new DefaultCredentialsProvider(this.globalProperties));
   }
 

From b804c9a4747b9d28ff4a7fa20b15c0f9341ddf47 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 29 Nov 2022 22:34:20 +0000
Subject: [PATCH 4/6] fix: use Statement for logging variables

---
 .../spring/composer/SpringAutoConfigClassComposer.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
index 7b1992b9ed..368c4ff01c 100644
--- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
+++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
@@ -642,7 +642,7 @@ private static MethodDefinition createClientBeanMethod(
             .setArguments(getQuotaProjectId)
             .build();
 
-    IfStatement projectIdLoggerStatement =
+    Statement projectIdLoggerStatement =
         LoggerUtils.createLoggerStatement(
             LoggerUtils.concatManyWithExprs(
                 ValueExpr.withValue(StringObjectValue.withValue("Quota project id set to ")),
@@ -713,7 +713,7 @@ private static MethodDefinition createClientBeanMethod(
             .setArguments(executorProviderVarExpr)
             .build();
 
-    IfStatement backgroundExecutorLoggerStatement =
+    Statement backgroundExecutorLoggerStatement =
         LoggerUtils.createLoggerStatement(
             ArithmeticOperationExpr.concatWithExprs(
                 ValueExpr.withValue(

From a9dc05b1fd880946c2aa02b2ee60c895dd839e68 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 29 Nov 2022 23:05:30 +0000
Subject: [PATCH 5/6] fix: use Statement return type in createLoggerStatement()

---
 .../java/com/google/api/generator/spring/utils/LoggerUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
index 721359d3bc..fa76175c56 100644
--- a/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
+++ b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
@@ -70,7 +70,7 @@ public static Statement getLoggerDeclarationExpr(String className, Map<String, T
     return ExprStatement.withExpr(loggerAssignmentExpr);
   }
 
-  public static IfStatement createLoggerStatement(Expr value, Map<String, TypeNode> types) {
+  public static Statement createLoggerStatement(Expr value, Map<String, TypeNode> types) {
     Variable loggerVariable =
         Variable.builder().setName("LOGGER").setType(STATIC_TYPES.get("Log")).build();
     MethodInvocationExpr loggerCallExpr =

From 1be7064206bc941a4abfd4092428115119fc81f4 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Wed, 30 Nov 2022 16:23:49 +0000
Subject: [PATCH 6/6] fix: unnecessary variable creation

---
 .../generator/spring/utils/LoggerUtils.java   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
index fa76175c56..1a92319f5a 100644
--- a/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
+++ b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
@@ -79,17 +79,15 @@ public static Statement createLoggerStatement(Expr value, Map<String, TypeNode>
             .setMethodName("trace")
             .setArguments(value)
             .build();
-    IfStatement loggerStatement =
-        IfStatement.builder()
-            .setConditionExpr(
-                MethodInvocationExpr.builder()
-                    .setExprReferenceExpr(VariableExpr.withVariable(loggerVariable))
-                    .setMethodName("isTraceEnabled")
-                    .setReturnType(TypeNode.BOOLEAN)
-                    .build())
-            .setBody(Arrays.asList(ExprStatement.withExpr(loggerCallExpr)))
-            .build();
-    return loggerStatement;
+    return IfStatement.builder()
+        .setConditionExpr(
+            MethodInvocationExpr.builder()
+                .setExprReferenceExpr(VariableExpr.withVariable(loggerVariable))
+                .setMethodName("isTraceEnabled")
+                .setReturnType(TypeNode.BOOLEAN)
+                .build())
+        .setBody(Arrays.asList(ExprStatement.withExpr(loggerCallExpr)))
+        .build();
   }
 
   public static Expr concatManyWithExprs(Expr... exprs) {