8000 feat: set logging level to trace (#1104) · googleapis/sdk-platform-java@dbb105e · GitHub
[go: up one dir, main page]
Skip to content

Commit dbb105e

Browse files
diegomarquezpdiegomarquezp
authored
feat: set logging level to trace (#1104)
* feat: degrade logging level to trace * feat: wrap logging with `isTraceEnabled()` * feat: credential usage logging * fix: use Statement for logging variables * fix: use Statement return type in createLoggerStatement() * fix: unnecessary variable creation
1 parent cc068c9 commit dbb105e

File tree

5 files changed

+712
-339
lines changed

5 files changed

+712
-339
lines changed

‎src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -386,24 +386,23 @@ private static MethodDefinition createCredentialsProviderBeanMethod(
386386
.setMethodName("hasKey")
387387
.setReturnType(TypeNode.BOOLEAN)
388388
.build();
389+
Statement logClientCredentials =
390+
LoggerUtils.createLoggerStatement(
391+
ValueExpr.withValue(
392+
StringObjectValue.withValue(
393+
"Using credentials from " + service.name() + "-specific configuration")),
394+
types);
389395
IfStatement clientCredentialsIfStatement =
390396
createIfStatement(
391-
clientPropertiesCredentialsHasKey, Arrays.asList(clientCredentialsReturnExpr), null);
397+
clientPropertiesCredentialsHasKey,
398+
Arrays.asList(logClientCredentials, clientCredentialsReturnExpr),
399+
null);
392400
bodyStatements.add(clientCredentialsIfStatement);
393-
394-
// @ConditionalOnMissingBean(name = "[serviceName]ServiceCredentials")
395-
AnnotationNode conditionalOnMissingBeanExpr =
396-
AnnotationNode.builder()
397-
.setType(STATIC_TYPES.get("ConditionalOnMissingBean"))
398-
.addDescription(
399-
AssignmentExpr.builder()
400-
.setVariableExpr(
401-
VariableExpr.withVariable(
402-
Variable.builder().setName("name").setType(TypeNode.STRING).build()))
403-
.setValueExpr(ValueExpr.withValue(StringObjectValue.withValue(methodName)))
404-
.build())
405-
.build();
406-
401+
bodyStatements.add(
402+
LoggerUtils.createLoggerStatement(
403+
ValueExpr.withValue(
404+
StringObjectValue.withValue("Using credentials from global configuration")),
405+
types));
407406
return MethodDefinition.builder()
408407
.setName(methodName)
409408
.setHeaderCommentStatements(
@@ -643,7 +642,7 @@ private static MethodDefinition createClientBeanMethod(
643642
.setArguments(getQuotaProjectId)
644643
.build();
645644

646-
ExprStatement projectIdLoggerStatement =
645+
Statement projectIdLoggerStatement =
647646
LoggerUtils.createLoggerStatement(
648647
LoggerUtils.concatManyWithExprs(
649648
ValueExpr.withValue(StringObjectValue.withValue("Quota project id set to ")),
@@ -714,7 +713,7 @@ private static MethodDefinition createClientBeanMethod(
714713
.setArguments(executorProviderVarExpr)
715714
.build();
716715

717-
ExprStatement backgroundExecutorLoggerStatement =
716+
Statement backgroundExecutorLoggerStatement =
718717
LoggerUtils.createLoggerStatement(
719718
ArithmeticOperationExpr.concatWithExprs(
720719
ValueExpr.withValue(

‎src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.google.api.generator.engine.ast.ConcreteReference;
2020
import com.google.api.generator.engine.ast.Expr;
2121
import com.google.api.generator.engine.ast.ExprStatement;
22+
import com.google.api.generator.engine.ast.IfStatement;
2223
import com.google.api.generator.engine.ast.MethodInvocationExpr;
2324
import com.google.api.generator.engine.ast.ScopeNode;
2425
import com.google.api.generator.engine.ast.Statement;
@@ -69,16 +70,24 @@ public static Statement getLoggerDeclarationExpr(String className, Map<String, T
6970
return ExprStatement.withExpr(loggerAssignmentExpr);
7071
}
7172

72-
public static ExprStatement createLoggerStatement(Expr value, Map<String, TypeNode> types) {
73+
public static Statement createLoggerStatement(Expr value, Map<String, TypeNode> types) {
7374
Variable loggerVariable =
7475
Variable.builder().setName("LOGGER").setType(STATIC_TYPES.get("Log")).build();
7576
MethodInvocationExpr loggerCallExpr =
7677
MethodInvocationExpr.builder()
7778
.setExprReferenceExpr(VariableExpr.withVariable(loggerVariable))
78-
.setMethodName("info")
79+
.setMethodName("trace")
7980
.setArguments(value)
8081
.build();
81-
return ExprStatement.withExpr(loggerCallExpr);
82+
return IfStatement.builder()
83+
.setConditionExpr(
84+
MethodInvocationExpr.builder()
85+
.setExprReferenceExpr(VariableExpr.withVariable(loggerVariable))
86+
.setMethodName("isTraceEnabled")
87+
.setReturnType(TypeNode.BOOLEAN)
88+
.build())
89+
.setBody(Arrays.asList(ExprStatement.withExpr(loggerCallExpr)))
90+
.build();
8291
}
8392

8493
public static Expr concatManyWithExprs(Expr... exprs) {

0 commit comments

Comments
 (0)
0