Skip to content

Commit 106e54b

Browse files
authored
Update errorprone (#412)
* Update errorprone * Sync * Spotless * More
1 parent ca6187a commit 106e54b

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSampler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ private void fetchTargets() {
205205
}
206206

207207
@Override
208+
@SuppressWarnings("Interruption")
208209
public void close() {
209210
ScheduledFuture<?> pollFuture = this.pollFuture;
210211
if (pollFuture != null) {

buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ plugins {
77
id("net.ltgt.nullaway")
88
}
99

10-
val disableErrorProne = properties["disableErrorProne"]?.toString()?.toBoolean() ?: false
11-
1210
dependencies {
1311
errorprone("com.google.errorprone:error_prone_core")
1412
errorprone("com.uber.nullaway:nullaway")
1513
}
1614

15+
val disableErrorProne = properties["disableErrorProne"]?.toString()?.toBoolean() ?: false
16+
1717
tasks {
1818
withType<JavaCompile>().configureEach {
1919
with(options) {
@@ -26,6 +26,9 @@ tasks {
2626
disableWarningsInGeneratedCode.set(true)
2727
allDisabledChecksAsWarnings.set(true)
2828

29+
// Ignore warnings for generated classes
30+
excludedPaths.set(".*/build/generated/.*")
31+
2932
// Still Java 8 mostly
3033
disable("Varifier")
3134

@@ -45,23 +48,14 @@ tasks {
4548
// deprecation warning.
4649
disable("UnnecessarilyFullyQualified")
4750

48-
// Ignore warnings for protobuf and jmh generated files.
49-
excludedPaths.set(".*generated.*|.*internal.shaded.*")
50-
51+
// TODO (trask) use animal sniffer
5152
disable("Java7ApiChecker")
5253
disable("Java8ApiChecker")
5354
disable("AndroidJdkLibsChecker")
5455

5556
// apparently disabling android doesn't disable this
5657
disable("StaticOrDefaultInterfaceMethod")
5758

58-
// Prevents defensive null checks and we have nullaway
59-
disable("ParameterMissingNullable")
60-
61-
// until we have everything converted, we need these
62-
disable("JdkObsolete")
63-
disable("UnnecessaryAnonymousClass")
64-
6559
// We don't depend on Guava so use normal splitting
6660
disable("StringSplitter")
6761

@@ -72,6 +66,12 @@ tasks {
7266
// We don't get much benefit from it anyways.
7367
disable("InlineMeSuggester")
7468

69+
// We have nullaway so don't need errorprone nullable checks which have more false positives.
70+
disable("FieldMissingNullable")
71+
disable("ParameterMissingNullable")
72+
disable("ReturnMissingNullable")
73+
disable("VoidMissingNullable")
74+
7575
// allow UPPERCASE type parameter names
7676
disable("TypeParameterNaming")
7777

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ val DEPENDENCY_SETS = listOf(
4141
),
4242
DependencySet(
4343
"com.google.errorprone",
44-
"2.12.1",
44+
"2.14.0",
4545
listOf("error_prone_annotations", "error_prone_core")
4646
),
4747
DependencySet(

0 commit comments

Comments
 (0)