Upgrade error_prone_annotations to 2.3.4

android/build.gradle

@@ -44,7 +44,7 @@ repositories {
 }
 
 dependencies {
-    errorprone 'com.google.errorprone:error_prone_core:2.3.3'
+    errorprone 'com.google.errorprone:error_prone_core:2.3.4'
     errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
 
     implementation 'io.grpc:grpc-core:1.27.0-SNAPSHOT' // CURRENT_GRPC_VERSION

build.gradle

@@ -113,7 +113,7 @@ subprojects {
         libraries = [
             android_annotations: "com.google.android:annotations:4.1.1.4",
             animalsniffer_annotations: "org.codehaus.mojo:animal-sniffer-annotations:1.18",
-            errorprone: "com.google.errorprone:error_prone_annotations:2.3.3",
+            errorprone: "com.google.errorprone:error_prone_annotations:2.3.4",
             gson: "com.google.code.gson:gson:2.8.6",
             guava: "com.google.guava:guava:${guavaVersion}",
             hpack: 'com.twitter:hpack:0.10.1',
@@ -263,7 +263,7 @@ subprojects {
 
         if (rootProject.properties.get('errorProne', true)) {
             dependencies {
-                errorprone 'com.google.errorprone:error_prone_core:2.3.3'
+                errorprone 'com.google.errorprone:error_prone_core:2.3.4'
                 errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
 
                 annotationProcessor 'com.google.guava:guava-beta-checker:1.0'

core/build.gradle

@@ -16,7 +16,10 @@ dependencies {
     compile project(':grpc-api'),
             libraries.gson,
             libraries.android_annotations,
-            libraries.perfmark
+            libraries.errorprone // to avoid using perfmark's dependency
+    compile (libraries.perfmark) {
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
+    }
     compile (libraries.opencensus_api) {
         // prefer our own versions instead of opencensus-api's dependency
         exclude group: 'com.google.code.findbugs', module: 'jsr305'

core/src/main/java/io/grpc/internal/ProxyDetectorImpl.java

@@ -122,6 +122,8 @@ class ProxyDetectorImpl implements ProxyDetector {
   // $ sudo tail -f /var/log/squid/access.log
 
   private static final Logger log = Logger.getLogger(ProxyDetectorImpl.class.getName());
+
+  @SuppressWarnings("UnnecessaryAnonymousClass") // grpc-java targets Java 7 (no method references)
   private static final AuthenticationProvider DEFAULT_AUTHENTICATOR = new AuthenticationProvider() {
     @Override
     public PasswordAuthentication requestPasswordAuthentication(
@@ -140,6 +142,8 @@ public PasswordAuthentication requestPasswordAuthentication(
           host, addr, port, protocol, prompt, scheme, url, Authenticator.RequestorType.PROXY);
     }
   };
+
+  @SuppressWarnings("UnnecessaryAnonymousClass") // grpc-java targets Java 7 (no method references)
   private static final Supplier<ProxySelector> DEFAULT_PROXY_SELECTOR =
       new Supplier<ProxySelector>() {
         @Override

cronet/build.gradle

@@ -51,7 +51,7 @@ android {
 }
 
 dependencies {
-    errorprone 'com.google.errorprone:error_prone_core:2.3.3'
+    errorprone 'com.google.errorprone:error_prone_core:2.3.4'
     errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
 
     implementation 'io.grpc:grpc-core:1.27.0-SNAPSHOT' // CURRENT_GRPC_VERSION

examples/pom.xml

@@ -65,7 +65,7 @@
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>2.3.3</version> <!-- prefer to use 2.3.3 or later -->
+      <version>2.3.4</version> <!-- prefer to use 2.3.3 or later -->
     </dependency>
     <dependency>
       <groupId>junit</groupId>

interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java

@@ -291,6 +291,8 @@ public ClientStreamTracer newClientStreamTracer(
           return tracer;
         }
       };
+
+  @SuppressWarnings("UnnecessaryAnonymousClass") // grpc-java targets Java 7 (no method references)
   private final ClientInterceptor tracerSetupInterceptor = new ClientInterceptor() {
         @Override
         public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(

netty/src/main/java/io/grpc/netty/Http2ControlFrameLimitEncoder.java

@@ -36,6 +36,8 @@ final class Http2ControlFrameLimitEncoder extends DecoratingHttp2ConnectionEncod
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(Http2ControlFrameLimitEncoder.class);
 
     private final int maxOutstandingControlFrames;
+
+    @SuppressWarnings("UnnecessaryAnonymousClass") // grpc-java targets Java 7 (no method references)
     private final ChannelFutureListener outstandingControlFramesListener = new ChannelFutureListener() {
         @Override
         public void operationComplete(ChannelFuture future) {

netty/src/main/java/io/grpc/netty/MaxConnectionIdleManager.java

@@ -28,6 +28,7 @@
  * Monitors connection idle time; shutdowns the connection if the max connection idle is reached.
  */
 abstract class MaxConnectionIdleManager {
+  @SuppressWarnings("UnnecessaryAnonymousClass") // grpc-java targets Java 7 (no method references)
   private static final Ticker systemTicker = new Ticker() {
     @Override
     public long nanoTime() {

netty/src/main/java/io/grpc/netty/WriteQueue.java

@@ -40,6 +40,7 @@ class WriteQueue {
   /**
    * {@link Runnable} used to schedule work onto the tail of the event loop.
    */
+  @SuppressWarnings("UnnecessaryAnonymousClass") // grpc-java targets Java 7 (no method references)
   private final Runnable later = new Runnable() {
     @Override
     public void run() {

okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/Http2.java

@@ -19,6 +19,7 @@
 
 package io.grpc.okhttp.internal.framed;
 
+import com.google.errorprone.annotations.FormatMethod;
 import io.grpc.okhttp.internal.Protocol;
 import java.io.IOException;
 import java.util.List;
@@ -361,7 +362,7 @@ private void readWindowUpdate(
         throws IOException {
       if (length != 4) throw ioException("TYPE_WINDOW_UPDATE length !=4: %s", length);
       long increment = (source.readInt() & 0x7fffffffL);
-      if (increment == 0) throw ioException("windowSizeIncrement was 0", increment);
+      if (increment == 0) throw ioException("windowSizeIncrement was 0");
       handler.windowUpdate(streamId, increment);
     }
 
@@ -586,10 +587,12 @@ void frameHeader(int streamId, int length, byte type, byte flags) throws IOExcep
     }
   }
 
+  @FormatMethod
   private static IllegalArgumentException illegalArgument(String message, Object... args) {
     throw new IllegalArgumentException(format(message, args));
   }
 
+  @FormatMethod
   private static IOException ioException(String message, Object... args) throws IOException {
     throw new IOException(format(message, args));
   }

repositories.bzl

@@ -17,7 +17,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "com.google.auth:google-auth-library-oauth2-http:0.19.0",
     "com.google.code.findbugs:jsr305:3.0.2",
     "com.google.code.gson:gson:jar:2.8.6",
-    "com.google.errorprone:error_prone_annotations:2.3.3",
+    "com.google.errorprone:error_prone_annotations:2.3.4",
     "com.google.guava:failureaccess:1.0.1",
     "com.google.guava:guava:28.1-android",
     "com.google.j2objc:j2objc-annotations:1.3",
@@ -226,9 +226,9 @@ def com_google_code_gson_gson():
 def com_google_errorprone_error_prone_annotations():
     jvm_maven_import_external(
         name = "com_google_errorprone_error_prone_annotations",
-        artifact = "com.google.errorprone:error_prone_annotations:2.3.3",
+        artifact = "com.google.errorprone:error_prone_annotations:2.3.4",
         server_urls = ["https://repo.maven.apache.org/maven2/"],
-        artifact_sha256 = "ec59f1b702d9afc09e8c3929f5c42777dec623a6ea2731ac694332c7d7680f5a",
+        artifact_sha256 = "baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c",
         licenses = ["notice"],  # Apache 2.0
     )