Fix: formatting

Author: AgraVator

api/src/main/java/io/grpc/ForwardingChannelBuilder2.java

@@ -258,7 +258,7 @@ public T disableServiceConfigLookUp() {
   }
 
   @Override
-  public T addMetricSink(MetricSink metricSink) {
+  protected T addMetricSink(MetricSink metricSink) {
     delegate().addMetricSink(metricSink);
     return thisT();
   }

api/src/main/java/io/grpc/ServerBuilder.java

@@ -424,10 +424,6 @@ public T setBinaryLog(BinaryLog binaryLog) {
     throw new UnsupportedOperationException();
   }
 
-
-
-
-
   /**
    * Builds a server using the given parameters.
    *

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

@@ -128,8 +128,6 @@ public static ManagedChannelBuilder<?> forTarget(String target) {
 
   private static final Method GET_CLIENT_INTERCEPTOR_METHOD;
 
-
-
   static {
     Method getClientInterceptorMethod = null;
     try {
@@ -717,7 +715,7 @@ public ManagedChannelImplBuilder enableCheckAuthority() {
   }
 
   @Override
-  public ManagedChannelImplBuilder addMetricSink(MetricSink metricSink) {
+  protected ManagedChannelImplBuilder addMetricSink(MetricSink metricSink) {
     metricSinks.add(checkNotNull(metricSink, "metric sink"));
     return this;
   }

rls/src/test/java/io/grpc/rls/RlsLoadBalancerTest.java

@@ -18,6 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.AdditionalAnswers.delegatesTo;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -52,7 +53,6 @@
 import io.grpc.LoadBalancer.Subchannel;
 import io.grpc.LoadBalancer.SubchannelPicker;
 import io.grpc.LoadBalancer.SubchannelStateListener;
-import io.grpc.LongCounterMetricInstrument;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.Metadata;
@@ -61,6 +61,7 @@
 import io.grpc.MetricInstrument;
 import io.grpc.MetricRecorder;
 import io.grpc.MetricRecorder.Registration;
+import io.grpc.MetricSink;
 import io.grpc.NameResolver.ConfigOrError;
 import io.grpc.NoopMetricSink;
 import io.grpc.ServerCall;
@@ -94,7 +95,6 @@
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import javax.annotation.Nonnull;
 import org.junit.After;
 import org.junit.Before;
@@ -361,7 +361,7 @@ public void metricsWithRealChannel() throws Exception {
         .directExecutor()
         .build()
         .start());
-    VerificationMetricSink metrics = new VerificationMetricSink();
+    MetricSink metrics = mock(MetricSink.class, delegatesTo(new NoopMetricSink()));
     ManagedChannel channel = grpcCleanupRule.register(
         InternalManagedChannelBuilder.addMetricSink(
             InProcessChannelBuilder.forName("fake-bigtable.googleapis.com")
@@ -379,7 +379,12 @@ public void metricsWithRealChannel() throws Exception {
     assertThat(recorder.awaitCompletion(10, TimeUnit.SECONDS)).isTrue();
     assertThat(recorder.getError()).isNull();
 
-    metrics.awaitCall();
+    verify(metrics).addLongCounter(
+        eqMetricInstrumentName("grpc.lb.rls.default_target_picks"),
+        eq(1L),
+        eq(Arrays.asList("directaddress:///fake-bigtable.googleapis.com", "localhost:8972",
+            "defaultTarget", "complete")),
+        eq(Arrays.asList("customvalue")));
   }
 
   @Test
@@ -926,34 +931,4 @@ public void registerBackendResponse(boolean throttled) {
     }
   }
 
-  private static final class VerificationMetricSink extends NoopMetricSink {
-    private final AtomicBoolean called =
-        new AtomicBoolean();
-
-    @Override
-    public void addLongCounter(
-        LongCounterMetricInstrument metricInstrument,
-        long value,
-        List<String> requiredLabelValues,
-        List<String> optionalLabelValues) {
-      if (metricInstrument.getName().equals("grpc.lb.rls.default_target_picks")
-          && value == 1L
-          && requiredLabelValues.equals(Arrays.asList(
-              "directaddress:///fake-bigtable.googleapis.com", "localhost:8972",
-              "defaultTarget", "complete"))
-          && optionalLabelValues.equals(Arrays.asList("customvalue"))) {
-        called.set(true);
-      }
-    }
-
-    public void awaitCall() throws InterruptedException {
-      long start = System.currentTimeMillis();
-      while (!called.get()) {
-        if (System.currentTimeMillis() - start > 5000) {
-          throw new AssertionError("Timed out waiting for metric sink call");
-        }
-        Thread.sleep(50);
-      }
-    }
-  }
 }

xds/src/test/java/io/grpc/xds/FakeControlPlaneXdsOtelIntegrationTest.java

@@ -44,8 +44,6 @@
 
 /**
  * xDS + OpenTelemetry E2E integration test using a fake control plane.
- * This class is skipped from Bazel builds because Bazel doesn't compile the
- * grpc-opentelemetry module.
  */
 @RunWith(Parameterized.class)
 public class FakeControlPlaneXdsOtelIntegrationTest {

xds/src/test/java/io/grpc/xds/WeightedRoundRobinLoadBalancerTest.java

@@ -22,6 +22,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
@@ -59,6 +60,7 @@
 import io.grpc.LongCounterMetricInstrument;
 import io.grpc.Metadata;
 import io.grpc.MetricRecorder;
+import io.grpc.MetricSink;
 import io.grpc.NameResolver;
 import io.grpc.NoopMetricSink;
 import io.grpc.ServerCall;
@@ -98,7 +100,6 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Before;
 import org.junit.Rule;
@@ -1309,7 +1310,7 @@ public void metricWithRealChannel() throws Exception {
         .directExecutor()
         .build()
         .start());
-    VerificationMetricSink metrics = new VerificationMetricSink();
+    MetricSink metrics = mock(MetricSink.class, delegatesTo(new NoopMetricSink()));
     Channel channel = grpcCleanupRule.register(
         InternalManagedChannelBuilder.addMetricSink(
             InProcessChannelBuilder.forName(serverName)
@@ -1331,7 +1332,11 @@ public void metricWithRealChannel() throws Exception {
 
     // Make sure at least one metric works. The other tests will make sure other metrics and the
     // edge cases are working. Since this is racy, we just care it happened at least once.
-    metrics.awaitCall();
+    verify(metrics, atLeast(1)).addLongCounter(
+        argThat((instr) -> instr.getName().equals("grpc.lb.wrr.rr_fallback")),
+        eq(1L),
+        eq(Arrays.asList("directaddress:///wrr-metrics")),
+        eq(Arrays.asList("", "")));
   }
 
 
@@ -1714,33 +1719,4 @@ public String getChannelTarget() {
       return channelTarget;
     }
   }
-
-  private static final class VerificationMetricSink extends NoopMetricSink {
-    private final AtomicBoolean called =
-        new AtomicBoolean();
-
-    @Override
-    public void addLongCounter(
-        LongCounterMetricInstrument metricInstrument,
-        long value,
-        List<String> requiredLabelValues,
-        List<String> optionalLabelValues) {
-      if (metricInstrument.getName().equals("grpc.lb.wrr.rr_fallback")
-          && value == 1L
-          && requiredLabelValues.equals(Arrays.asList("directaddress:///wrr-metrics"))
-          && optionalLabelValues.equals(Arrays.asList("", ""))) {
-        called.set(true);
-      }
-    }
-
-    public void awaitCall() throws InterruptedException {
-      long start = System.currentTimeMillis();
-      while (!called.get()) {
-        if (System.currentTimeMillis() - start > 5000) {
-          throw new AssertionError("Timed out waiting for metric sink call");
-        }
-        Thread.sleep(50);
-      }
-    }
-  }
 }