fix: suggested changes

Author: AgraVator

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

@@ -16,89 +16,83 @@
 
 package io.grpc;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 /**
  * TCP Metrics defined to be shared across transport implementations.
+ * These metrics and their definitions are specified in
+ * <a href=
+ * "https://github.com/grpc/proposal/blob/master/A80-tcp-metrics.md">gRFC
+ * A80</a>.
  */
 @Internal
 public final class InternalTcpMetrics {
 
-  private InternalTcpMetrics() {}
+  private InternalTcpMetrics() {
+  }
 
   private static final List<String> OPTIONAL_LABELS = Arrays.asList(
       "network.local.address",
       "network.local.port",
       "network.peer.address",
       "network.peer.port");
 
-  public static final DoubleHistogramMetricInstrument MIN_RTT_INSTRUMENT = 
+  public static final DoubleHistogramMetricInstrument MIN_RTT_INSTRUMENT =
       MetricInstrumentRegistry.getDefaultRegistry()
           .registerDoubleHistogram(
-          "grpc.tcp.min_rtt",
-          "Minimum round-trip time of a TCP connection",
-          "s",
-          getMinRttBuckets(),
-          Collections.emptyList(),
-          OPTIONAL_LABELS,
-          false);
+              "grpc.tcp.min_rtt",
+              "Minimum round-trip time of a TCP connection",
+              "s",
+              Collections.emptyList(),
+              Collections.emptyList(),
+              OPTIONAL_LABELS,
+              false);
 
-  public static final LongCounterMetricInstrument CONNECTIONS_CREATED_INSTRUMENT = 
+  public static final LongCounterMetricInstrument CONNECTIONS_CREATED_INSTRUMENT =
       MetricInstrumentRegistry
-      .getDefaultRegistry()
-      .registerLongCounter(
-          "grpc.tcp.connections_created",
-          "The total number of TCP connections established.",
-          "{connection}",
-          Collections.emptyList(),
-          OPTIONAL_LABELS,
-          false);
+          .getDefaultRegistry()
+          .registerLongCounter(
+              "grpc.tcp.connections_created",
+              "The total number of TCP connections established.",
+              "{connection}",
+              Collections.emptyList(),
+              OPTIONAL_LABELS,
+              false);
 
-  public static final LongUpDownCounterMetricInstrument CONNECTION_COUNT_INSTRUMENT = 
+  public static final LongUpDownCounterMetricInstrument CONNECTION_COUNT_INSTRUMENT =
       MetricInstrumentRegistry
-      .getDefaultRegistry()
-      .registerLongUpDownCounter(
-          "grpc.tcp.connection_count",
-          "The current number of active TCP connections.",
-          "{connection}",
-          Collections.emptyList(),
-          OPTIONAL_LABELS,
-          false
-      );
+          .getDefaultRegistry()
+          .registerLongUpDownCounter(
+              "grpc.tcp.connection_count",
+              "The current number of active TCP connections.",
+              "{connection}",
+              Collections.emptyList(),
+              OPTIONAL_LABELS,
+              false);
 
-  public static final LongCounterMetricInstrument PACKETS_RETRANSMITTED_INSTRUMENT = 
+  public static final LongCounterMetricInstrument PACKETS_RETRANSMITTED_INSTRUMENT =
       MetricInstrumentRegistry
-      .getDefaultRegistry()
-      .registerLongCounter(
-          "grpc.tcp.packets_retransmitted",
-          "The total number of packets retransmitted for all TCP connections.",
-          "{packet}",
-          Collections.emptyList(),
-          OPTIONAL_LABELS,
-          false
-      );
+          .getDefaultRegistry()
+          .registerLongCounter(
+              "grpc.tcp.packets_retransmitted",
+              "The total number of packets retransmitted for all TCP connections.",
+              "{packet}",
+              Collections.emptyList(),
+              OPTIONAL_LABELS,
+              false);
 
-  public static final LongCounterMetricInstrument RECURRING_RETRANSMITS_INSTRUMENT = 
+  public static final LongCounterMetricInstrument RECURRING_RETRANSMITS_INSTRUMENT =
       MetricInstrumentRegistry
-      .getDefaultRegistry()
-      .registerLongCounter(
-          "grpc.tcp.recurring_retransmits",
-          "The total number of times the retransmit timer popped for all TCP"
-              + " connections.",
-          "{timeout}",
-          Collections.emptyList(),
-          OPTIONAL_LABELS,
-          false
-      );
+          .getDefaultRegistry()
+          .registerLongCounter(
+              "grpc.tcp.recurring_retransmits",
+              "The total number of times the retransmit timer "
+                  + "popped for all TCP connections.",
+              "{timeout}",
+              Collections.emptyList(),
+              OPTIONAL_LABELS,
+              false);
 
-  private static List<Double> getMinRttBuckets() {
-    List<Double> buckets = new ArrayList<>(100);
-    for (int i = 1; i <= 100; i++) {
-      buckets.add(1e-6 * Math.pow(2.0, i * 0.24));
-    }
-    return Collections.unmodifiableList(buckets);
-  }
 }

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

@@ -441,8 +441,9 @@ public T setBinaryLog(BinaryLog binaryLog) {
    * @param metricSink the metric sink to add.
    * @return this
    */
+  @ExperimentalApi("https://github.com/grpc/grpc-java/issues/12693")
   public T addMetricSink(MetricSink metricSink) {
-    throw new UnsupportedOperationException();
+    return thisT();
   }
 
   /**

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

@@ -21,7 +21,6 @@
 import static io.netty.channel.ChannelOption.ALLOCATOR;
 import static io.netty.channel.ChannelOption.SO_KEEPALIVE;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -179,10 +178,6 @@ class NettyServer implements InternalServer, InternalWithLogId {
         String.valueOf(addresses));
   }
 
-  @VisibleForTesting
-  MetricRecorder getMetricRecorder() {
-    return metricRecorder;
-  }
 
   @Override
   public SocketAddress getListenSocketAddress() {