Update errorprone (open-telemetry#4134)

anuraaga · web-flow · commit 3773d0b18aa4 · 2022-01-31T08:00:17.000-08:00
diff --git a/api/all/src/main/java/io/opentelemetry/api/common/Attributes.java b/api/all/src/main/java/io/opentelemetry/api/common/Attributes.java
@@ -117,6 +117,7 @@ static <T, U, V, W> Attributes of(
    * Returns a {@link Attributes} instance with five key-value pairs. Order of the keys is not
    * preserved. Duplicate keys will be removed.
    */
+  @SuppressWarnings("TooManyParameters")
   static <T, U, V, W, X> Attributes of(
       AttributeKey<T> key1,
       T value1,
diff --git a/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts
@@ -50,6 +50,7 @@ tasks {
 
         // Limits APIs
         disable("NoFunctionalReturnType")
+        disable("PreferredInterfaceType")
 
         // We don't depend on Guava so use normal splitting
         disable("StringSplitter")
@@ -61,10 +62,10 @@ tasks {
         // We don't get much benefit from it anyways.
         disable("InlineMeSuggester")
 
-        // Prevents defensive null checks, and we have nullaway anyways
+        // We have nullaway so don't need errorprone nullable checks which have more false positives.
+        disable("FieldMissingNullable")
         disable("ParameterMissingNullable")
-
-        // javax.annotation.Nullable doesn't support annotating type parameters
+        disable("ReturnMissingNullable")
         disable("VoidMissingNullable")
 
         // Only used in comments, but couldn't SuppressWarnings for some reason
@@ -73,9 +74,6 @@ tasks {
         if (name.contains("Jmh") || name.contains("Test")) {
           // Allow underscore in test-type method names
           disable("MemberName")
-
-          // We only enable null checking on main sources
-          disable("FieldMissingNullable")
         }
 
         option("NullAway:CustomContractAnnotations", "io.opentelemetry.api.internal.Contract")
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -32,7 +32,7 @@ val DEPENDENCY_SETS = listOf(
   ),
   DependencySet(
     "com.google.errorprone",
-    "2.10.0",
+    "2.11.0",
     listOf("error_prone_annotations", "error_prone_core")
   ),
   DependencySet(
