-
Notifications
You must be signed in to change notification settings - Fork 135
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
Implement LoggerInterpolationConsumesThrowable #1886
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
109 changes: 109 additions & 0 deletions
109
.../src/main/java/com/palantir/baseline/errorprone/LoggerInterpolationConsumesThrowable.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
/* | ||
* (c) Copyright 2017 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.BugPattern.SeverityLevel; | ||
import com.google.errorprone.VisitorState; | ||
import com.google.errorprone.bugpatterns.BugChecker; | ||
import com.google.errorprone.bugpatterns.BugChecker.MethodInvocationTreeMatcher; | ||
import com.google.errorprone.matchers.Description; | ||
import com.google.errorprone.matchers.Matcher; | ||
import com.google.errorprone.matchers.method.MethodMatchers; | ||
import com.sun.source.tree.ExpressionTree; | ||
import com.sun.source.tree.LiteralTree; | ||
import com.sun.source.tree.MethodInvocationTree; | ||
import com.sun.source.tree.Tree; | ||
import java.util.List; | ||
|
||
@AutoService(BugChecker.class) | ||
@BugPattern( | ||
name = "LoggerInterpolationConsumesThrowable", | ||
link = "https://github.com/palantir/gradle-baseline#baseline-error-prone-checks", | ||
linkType = BugPattern.LinkType.CUSTOM, | ||
severity = SeverityLevel.ERROR, | ||
summary = "Logger call interpolation markers should not be used for the throwable parameter because they " | ||
+ "prevent stack traces from being logged in favor of the string value of the Throwable.") | ||
public final class LoggerInterpolationConsumesThrowable extends BugChecker implements MethodInvocationTreeMatcher { | ||
|
||
private static final Matcher<ExpressionTree> LOG_METHOD = MethodMatchers.instanceMethod() | ||
.onDescendantOfAny("org.slf4j.Logger", "com.palantir.logsafe.logger.SafeLogger") | ||
.namedAnyOf("trace", "debug", "info", "warn", "error", "fatal"); | ||
|
||
private static final Matcher<ExpressionTree> MARKER = MoreMatchers.isSubtypeOf("org.slf4j.Marker"); | ||
private static final Matcher<ExpressionTree> THROWABLE = MoreMatchers.isSubtypeOf(Throwable.class); | ||
|
||
@Override | ||
public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) { | ||
if (!LOG_METHOD.matches(tree, state)) { | ||
return Description.NO_MATCH; | ||
} | ||
|
||
List<? extends ExpressionTree> args = tree.getArguments(); | ||
// No need to verify logging calls with only a message | ||
if (args.size() <= 1) { | ||
return Description.NO_MATCH; | ||
} | ||
|
||
// Not problematic unless slf4j curly braces consume a throwable, so we can short-circuit out. | ||
int throwableIndex = args.size() - 1; | ||
ExpressionTree lastArg = args.get(throwableIndex); | ||
if (!THROWABLE.matches(lastArg, state)) { | ||
return Description.NO_MATCH; | ||
} | ||
|
||
boolean hasMarker = MARKER.matches(tree.getArguments().get(0), state); | ||
int messageIndex = hasMarker ? 1 : 0; | ||
ExpressionTree messageArg = args.get(messageIndex); | ||
|
||
if (messageArg.getKind() != Tree.Kind.STRING_LITERAL) { | ||
return Description.NO_MATCH; | ||
} | ||
|
||
String literalMessage = (String) ((LiteralTree) messageArg).getValue(); | ||
int stringPlaceholders = countPlaceholders(literalMessage); | ||
int nonThrowableParameters = throwableIndex - messageIndex - 1; | ||
if (stringPlaceholders <= nonThrowableParameters) { | ||
return Description.NO_MATCH; | ||
} | ||
int extraPlaceholders = stringPlaceholders - nonThrowableParameters; | ||
return buildDescription(tree) | ||
.setMessage(String.format( | ||
"Please remove %d '{}' placeholder%s. Logging statement contains %d placeholders for %d " | ||
+ "parameters. The Throwable will be consumed as a parameter (string value) rather " | ||
+ "than producing a stack trace.", | ||
extraPlaceholders, | ||
extraPlaceholders == 1 ? "" : "s", | ||
stringPlaceholders, | ||
nonThrowableParameters)) | ||
.build(); | ||
} | ||
|
||
private int countPlaceholders(String formatString) { | ||
int placeholders = 0; | ||
int index = 0; | ||
while (true) { | ||
index = formatString.indexOf("{}", index); | ||
if (index < 0) { | ||
return placeholders; | ||
} | ||
index++; | ||
placeholders++; | ||
} | ||
} | ||
} |
125 changes: 125 additions & 0 deletions
125
.../test/java/com/palantir/baseline/errorprone/LoggerInterpolationConsumesThrowableTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,125 @@ | ||
/* | ||
* (c) Copyright 2021 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.errorprone.CompilationTestHelper; | ||
import org.junit.jupiter.api.Test; | ||
|
||
class LoggerInterpolationConsumesThrowableTest { | ||
|
||
@Test | ||
void testOneExtra_slf4j() { | ||
helper().addSourceLines( | ||
"Test.java", | ||
"import org.slf4j.*;", | ||
"class Test {", | ||
" static {", | ||
" // BUG: Diagnostic contains: Please remove 1 '{}' placeholder.", | ||
" LoggerFactory.getLogger(Test.class).error(\"{}\", new RuntimeException());", | ||
" }", | ||
"}") | ||
.doTest(); | ||
} | ||
|
||
@Test | ||
void testOneExtra_safelogger() { | ||
helper().addSourceLines( | ||
"Test.java", | ||
"import com.palantir.logsafe.logger.*;", | ||
"class Test {", | ||
" static {", | ||
" // BUG: Diagnostic contains: Please remove 1 '{}' placeholder.", | ||
" SafeLoggerFactory.get(Test.class).error(\"{}\", new RuntimeException());", | ||
" }", | ||
"}") | ||
.doTest(); | ||
} | ||
|
||
@Test | ||
void testOneExtraWithMarker() { | ||
helper().addSourceLines( | ||
"Test.java", | ||
"import org.slf4j.*;", | ||
"class Test {", | ||
" static {", | ||
" // BUG: Diagnostic contains: Please remove 1 '{}' placeholder.", | ||
" LoggerFactory.getLogger(Test.class).error(", | ||
" MarkerFactory.getMarker(\"x\"), \"{}\", new RuntimeException());", | ||
" }", | ||
"}") | ||
.doTest(); | ||
} | ||
|
||
@Test | ||
void testOneExtraWithParameter() { | ||
helper().addSourceLines( | ||
"Test.java", | ||
"import org.slf4j.*;", | ||
"class Test {", | ||
" static {", | ||
" // BUG: Diagnostic contains: Please remove 1 '{}' placeholder.", | ||
" LoggerFactory.getLogger(Test.class).error(\"{} {}\", 1, new RuntimeException());", | ||
" }", | ||
"}") | ||
.doTest(); | ||
} | ||
|
||
@Test | ||
void testTwoExtra() { | ||
helper().addSourceLines( | ||
"Test.java", | ||
"import org.slf4j.*;", | ||
"class Test {", | ||
" static {", | ||
" // BUG: Diagnostic contains: Please remove 2 '{}' placeholders.", | ||
" LoggerFactory.getLogger(Test.class).error(\"{} {}\", new RuntimeException());", | ||
" }", | ||
"}") | ||
.doTest(); | ||
} | ||
|
||
@Test | ||
void testTwoExtraWithParameter() { | ||
helper().addSourceLines( | ||
"Test.java", | ||
"import org.slf4j.*;", | ||
"class Test {", | ||
" static {", | ||
" // BUG: Diagnostic contains: Please remove 2 '{}' placeholders.", | ||
" LoggerFactory.getLogger(Test.class).error(\"{} {} {}\", 1, new RuntimeException());", | ||
" }", | ||
"}") | ||
.doTest(); | ||
} | ||
|
||
@Test | ||
void testExtraParamsIgnoredWhenNoThrowableIsPresent() { | ||
helper().addSourceLines( | ||
"Test.java", | ||
"import org.slf4j.*;", | ||
"class Test {", | ||
" static {", | ||
" LoggerFactory.getLogger(Test.class).error(\"{} {} {}\", 1);", | ||
" }", | ||
"}") | ||
.doTest(); | ||
} | ||
|
||
private CompilationTestHelper helper() { | ||
return CompilationTestHelper.newInstance(LoggerInterpolationConsumesThrowable.class, getClass()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
type: improvement | ||
improvement: | ||
description: 'error-prone LoggerInterpolationConsumesThrowable: Flag as an ERROR | ||
when logging statements fail to produce a stack trace due to excessive slf4j-style | ||
interpolation placeholders.' | ||
links: | ||
- https://github.com/palantir/gradle-baseline/pull/1886 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are a few common patterns we could likely auto-fix, but enough cases we can't that I haven't attempted to implement one.
If we find a lot of failures ending with
{}
or: {}
it may be reasonable to automatically update them.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be interesting to track how many excavators fail to upgrade with this check, given we can't autofix them