Skip to content
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.

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

Feature: Add consistent logging errorprone rule #1644

Merged
merged 8 commits into from
Feb 12, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ Safe Logging can be found at [github.com/palantir/safe-logging](https://github.c
- `IncubatingMethod`: Prevents calling Conjure incubating APIs unless you explicitly opt-out of the check on a per-use or per-project basis.
- `CompileTimeConstantViolatesLiskovSubstitution`: Requires consistent application of the `@CompileTimeConstant` annotation to resolve inconsistent validation based on the reference type on which the met is invoked.
- `ClassInitializationDeadlock`: Detect type structures which can cause deadlocks initializing classes.
- `ConsistentLoggerName`: Ensure Loggers are named consistently.

### Programmatic Application

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* (c) Copyright 2020 Palantir Technologies Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.palantir.baseline.errorprone;

import com.google.auto.service.AutoService;
import com.google.errorprone.BugPattern;
import com.google.errorprone.VisitorState;
import com.google.errorprone.bugpatterns.BugChecker;
import com.google.errorprone.fixes.SuggestedFixes;
import com.google.errorprone.matchers.Description;
import com.google.errorprone.matchers.Matcher;
import com.google.errorprone.matchers.Matchers;
import com.google.errorprone.matchers.method.MethodMatchers;
import com.sun.source.tree.VariableTree;

@AutoService(BugChecker.class)
@BugPattern(
name = "ConsistentLoggerName",
link = "https://github.com/palantir/gradle-baseline#baseline-error-prone-checks",
linkType = BugPattern.LinkType.CUSTOM,
providesFix = BugPattern.ProvidesFix.REQUIRES_HUMAN_ATTENTION,
severity = BugPattern.SeverityLevel.WARNING,
summary = "Loggers created using getLogger(Class<?>) must be named 'log'.")
public final class ConsistentLoggerName extends BugChecker implements BugChecker.VariableTreeMatcher {

private static final Matcher<VariableTree> matcher = Matchers.allOf(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thoughts on filtering down to static final fields in this case? I think we should add other rules to require loggers to be private+static+final, but in the case of odd legacy code we should flag the most specific failure. I'm not confident we'd want instance loggers to be renamed automatically, I just don't have a good enough sense for all the places they might exist.

Matchers.isField(),
Matchers.isStatic(),
MoreMatchers.isFinal(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can avoid adding a new utility:

Suggested change
MoreMatchers.isFinal(),
Matchers.hasModifier(Modifier.FINAL),

That will match interface Iface { Logger log = LoggerFactory.getLogger(Iface.class); } as final which is why we had to implement the custom MoreMatchers.hasExplicitModifier for our RedundantModifier check.

Matchers.isSubtypeOf("org.slf4j.Logger"),
Matchers.variableInitializer(MethodMatchers.staticMethod()
.onClass("org.slf4j.LoggerFactory")
.named("getLogger")
// Only match the 'class' constructor
.withParameters(Class.class.getName())));

@Override
public Description matchVariable(VariableTree tree, VisitorState state) {
if (matcher.matches(tree, state) && !tree.getName().contentEquals("log")) {
return buildDescription(tree)
.addFix(SuggestedFixes.renameVariable(tree, "log", state))
.build();
}
return Description.NO_MATCH;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package com.palantir.baseline.errorprone;

import static com.google.errorprone.util.ASTHelpers.getSymbol;
import static com.sun.tools.javac.code.Flags.FINAL;

import com.google.errorprone.VisitorState;
import com.google.errorprone.matchers.Matcher;
import com.google.errorprone.matchers.Matchers;
Expand Down Expand Up @@ -118,5 +121,12 @@ static Matcher<MethodTree> hasSignature(String signature) {
};
}

public static <T extends Tree> Matcher<T> isFinal() {
return (tree, state) -> {
Symbol sym = getSymbol(tree);
return sym != null && (sym.flags_field & FINAL) != 0;
};
}

private MoreMatchers() {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* (c) Copyright 2020 Palantir Technologies Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.palantir.baseline.errorprone;

import org.junit.jupiter.api.Test;

class ConsistentLoggerNameTest {

@Test
void testFix() {
fix().addInputLines(
"Test.java",
"import org.slf4j.*;",
"class Test {",
" private static final Logger LOG = LoggerFactory.getLogger(Test.class);",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about logger -> log? or do you think that's cool?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything goes to log. There can only be 1 name for loggers

"}")
.addOutputLines(
"Test.java",
"import org.slf4j.*;",
"class Test {",
" private static final Logger log = LoggerFactory.getLogger(Test.class);",
"}")
.doTest();
}

@Test
void testFix_references() {
fix().addInputLines(
"Test.java",
"import org.slf4j.*;",
"class Test {",
" private static final Logger LOG = LoggerFactory.getLogger(Test.class);",
" private void foo() {",
" LOG.error(\"error\");",
" }",
"}")
.addOutputLines(
"Test.java",
"import org.slf4j.*;",
"class Test {",
" private static final Logger log = LoggerFactory.getLogger(Test.class);",
" private void foo() {",
" log.error(\"error\");",
" }",
"}")
.doTest();
}

@Test
void ignores_local_variables() {
fix().addInputLines(
"Test.java",
"import org.slf4j.*;",
"class Test {",
" private Logger LOG = LoggerFactory.getLogger(Test.class);",
"}")
.addOutputLines(
ferozco marked this conversation as resolved.
Show resolved Hide resolved
"Test.java",
"import org.slf4j.*;",
"class Test {",
" private Logger LOG = LoggerFactory.getLogger(Test.class);",
"}")
.doTest();
}

@Test
void ignores_non_final_methods() {
fix().addInputLines(
"Test.java",
"import org.slf4j.*;",
"class Test {",
" private static Logger LOG = LoggerFactory.getLogger(Test.class);",
"}")
.addOutputLines(
ferozco marked this conversation as resolved.
Show resolved Hide resolved
"Test.java",
"import org.slf4j.*;",
"class Test {",
" private static Logger LOG = LoggerFactory.getLogger(Test.class);",
"}")
.doTest();
}

private RefactoringValidator fix() {
return RefactoringValidator.of(new ConsistentLoggerName(), getClass());
}
}
5 changes: 5 additions & 0 deletions changelog/@unreleased/pr-1644.v2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type: feature
feature:
description: Add consistent logging errorprone rule
links:
- https://github.com/palantir/gradle-baseline/pull/1644
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class BaselineErrorProneExtension {
// "CatchSpecificity",
"CollectionStreamForEach",
"CompileTimeConstantViolatesLiskovSubstitution",
"ConsistentLoggerName",
"DeprecatedGuavaObjects",
"ExecutorSubmitRunnableFutureIgnored",
"ExtendsErrorOrThrowable",
Expand Down