Skip to content

feat: set logging level to trace #1104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegomarquezp merged 6 commits into from
Dec 1, 2022
Merged

feat: set logging level to trace #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57b75a4
feat: degrade logging level to trace
diegomarquezp Nov 29, 2022
7084f76
feat: wrap logging with `isTraceEnabled()`
diegomarquezp Nov 29, 2022
2f8e6d3
feat: credential usage logging
diegomarquezp Nov 29, 2022
b804c9a
fix: use Statement for logging variables
diegomarquezp Nov 29, 2022
a9dc05b
fix: use Statement return type in createLoggerStatement()
diegomarquezp Nov 29, 2022
1be7064
fix: unnecessary variable creation
diegomarquezp Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -643,7 +642,7 @@ private static MethodDefinition createClientBeanMethod(
.setArguments(getQuotaProjectId)
.build();

ExprStatement projectIdLoggerStatement =
Statement projectIdLoggerStatement =
LoggerUtils.createLoggerStatement(
LoggerUtils.concatManyWithExprs(
ValueExpr.withValue(StringObjectValue.withValue("Quota project id set to ")),
Expand Down Expand Up @@ -714,7 +713,7 @@ private static MethodDefinition createClientBeanMethod(
.setArguments(executorProviderVarExpr)
.build();

ExprStatement backgroundExecutorLoggerStatement =
Statement backgroundExecutorLoggerStatement =
LoggerUtils.createLoggerStatement(
ArithmeticOperationExpr.concatWithExprs(
ValueExpr.withValue(
Expand Down
15 changes: 12 additions & 3 deletions src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -69,16 +70,24 @@ 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 Statement createLoggerStatement(Expr value, Map<String, TypeNode> types) {
Variable loggerVariable =
Variable.builder().setName("LOGGER").setType(STATIC_TYPES.get("Log")).build();
MethodInvocationExpr loggerCallExpr =
MethodInvocationExpr.builder()
.setExprReferenceExpr(VariableExpr.withVariable(loggerVariable))
.setMethodName("info")
.setMethodName("trace")
.setArguments(value)
.build();
return ExprStatement.withExpr(loggerCallExpr);
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) {
Expand Down
Loading