all: move Channelz to io.grpc as InternalChannelz (#4797)

This is an API used to coordinate across packages and must live in
`io.grpc`.

Prepending `Internal` makes it easier to detect and hide this class
from public visibility when using certain build tools.

fixes #4796

14 files changed, 45 insertions, 45 deletions

diff --git a/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java b/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java
index 4640693f2..046120025 100644
--- a/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java
+++ b/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java
@@ -18,7 +18,7 @@ package io.grpc.netty;
 
 import io.grpc.Attributes;
 import io.grpc.Internal;
-import io.grpc.internal.Channelz;
+import io.grpc.InternalChannelz;
 import io.netty.channel.ChannelPromise;
 import io.netty.handler.codec.http2.Http2ConnectionDecoder;
 import io.netty.handler.codec.http2.Http2ConnectionEncoder;
@@ -45,8 +45,8 @@ public abstract class GrpcHttp2ConnectionHandler extends Http2ConnectionHandler
   }
 
   /**
-   * Same as {@link #handleProtocolNegotiationCompleted(Attributes, Channelz.Security)}
-   * but with no {@link io.grpc.internal.Channelz.Security}.
+   * Same as {@link #handleProtocolNegotiationCompleted(Attributes, InternalChannelz.Security)}
+   * but with no {@link InternalChannelz.Security}.
    *
    * @deprecated Use the two argument method instead.
    */
@@ -64,7 +64,8 @@ public abstract class GrpcHttp2ConnectionHandler extends Http2ConnectionHandler
    * @param attrs arbitrary attributes passed after protocol negotiation (eg. SSLSession).
    * @param securityInfo informs channelz about the security protocol.
    */
-  public void handleProtocolNegotiationCompleted(Attributes attrs, Channelz.Security securityInfo) {
+  public void handleProtocolNegotiationCompleted(
+      Attributes attrs, InternalChannelz.Security securityInfo) {
   }
 
   /**
diff --git a/netty/src/main/java/io/grpc/netty/InternalNettySocketSupport.java b/netty/src/main/java/io/grpc/netty/InternalNettySocketSupport.java
index 084987a4e..2c34cfe16 100644
--- a/netty/src/main/java/io/grpc/netty/InternalNettySocketSupport.java
+++ b/netty/src/main/java/io/grpc/netty/InternalNettySocketSupport.java
@@ -17,7 +17,7 @@
 package io.grpc.netty;
 
 import io.grpc.Internal;
-import io.grpc.internal.Channelz.TcpInfo;
+import io.grpc.InternalChannelz.TcpInfo;
 import java.util.Map;
 
 /**
diff --git a/netty/src/main/java/io/grpc/netty/NettyClientHandler.java b/netty/src/main/java/io/grpc/netty/NettyClientHandler.java
index 5c216d94e..1b77855a5 100644
--- a/netty/src/main/java/io/grpc/netty/NettyClientHandler.java
+++ b/netty/src/main/java/io/grpc/netty/NettyClientHandler.java
@@ -24,10 +24,10 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Supplier;
 import io.grpc.Attributes;
+import io.grpc.InternalChannelz;
 import io.grpc.Metadata;
 import io.grpc.Status;
 import io.grpc.StatusException;
-import io.grpc.internal.Channelz;
 import io.grpc.internal.ClientStreamListener.RpcProgress;
 import io.grpc.internal.ClientTransport.PingCallback;
 import io.grpc.internal.GrpcUtil;
@@ -106,7 +106,7 @@ class NettyClientHandler extends AbstractNettyHandler {
   private WriteQueue clientWriteQueue;
   private Http2Ping ping;
   private Attributes attributes = Attributes.EMPTY;
-  private Channelz.Security securityInfo;
+  private InternalChannelz.Security securityInfo;
 
   static NettyClientHandler newHandler(
       ClientTransportLifecycleManager lifecycleManager,
@@ -418,7 +418,7 @@ class NettyClientHandler extends AbstractNettyHandler {
 
   @Override
   public void handleProtocolNegotiationCompleted(
-      Attributes attributes, Channelz.Security securityInfo) {
+      Attributes attributes, InternalChannelz.Security securityInfo) {
     this.attributes = attributes;
     this.securityInfo = securityInfo;
     super.handleProtocolNegotiationCompleted(attributes, securityInfo);
@@ -429,7 +429,7 @@ class NettyClientHandler extends AbstractNettyHandler {
     return eagAttributes;
   }
 
-  Channelz.Security getSecurityInfo() {
+  InternalChannelz.Security getSecurityInfo() {
     return securityInfo;
   }
 
diff --git a/netty/src/main/java/io/grpc/netty/NettyClientTransport.java b/netty/src/main/java/io/grpc/netty/NettyClientTransport.java
index 894cb5ea9..9293b9f2f 100644
--- a/netty/src/main/java/io/grpc/netty/NettyClientTransport.java
+++ b/netty/src/main/java/io/grpc/netty/NettyClientTransport.java
@@ -26,10 +26,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import io.grpc.Attributes;
 import io.grpc.CallOptions;
+import io.grpc.InternalChannelz.SocketStats;
+import io.grpc.LogId;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.Status;
-import io.grpc.internal.Channelz.SocketStats;
 import io.grpc.internal.ClientStream;
 import io.grpc.internal.ConnectionClientTransport;
 import io.grpc.internal.FailingClientStream;
@@ -37,7 +38,6 @@ import io.grpc.internal.GrpcUtil;
 import io.grpc.internal.Http2Ping;
 import io.grpc.internal.KeepAliveManager;
 import io.grpc.internal.KeepAliveManager.ClientKeepAlivePinger;
-import io.grpc.internal.LogId;
 import io.grpc.internal.StatsTraceContext;
 import io.grpc.internal.TransportTracer;
 import io.netty.bootstrap.Bootstrap;
diff --git a/netty/src/main/java/io/grpc/netty/NettyServer.java b/netty/src/main/java/io/grpc/netty/NettyServer.java
index d85b13d5e..840fe483b 100644
--- a/netty/src/main/java/io/grpc/netty/NettyServer.java
+++ b/netty/src/main/java/io/grpc/netty/NettyServer.java
@@ -26,17 +26,17 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import io.grpc.Instrumented;
+import io.grpc.InternalChannelz;
+import io.grpc.InternalChannelz.SocketStats;
+import io.grpc.LogId;
 import io.grpc.ServerStreamTracer;
-import io.grpc.internal.Channelz;
-import io.grpc.internal.Channelz.SocketStats;
-import io.grpc.internal.Instrumented;
+import io.grpc.WithLogId;
 import io.grpc.internal.InternalServer;
-import io.grpc.internal.LogId;
 import io.grpc.internal.ServerListener;
 import io.grpc.internal.ServerTransportListener;
 import io.grpc.internal.SharedResourceHolder;
 import io.grpc.internal.TransportTracer;
-import io.grpc.internal.WithLogId;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -92,7 +92,7 @@ class NettyServer implements InternalServer, WithLogId {
   private final ReferenceCounted eventLoopReferenceCounter = new EventLoopReferenceCounter();
   private final List<ServerStreamTracer.Factory> streamTracerFactories;
   private final TransportTracer.Factory transportTracerFactory;
-  private final Channelz channelz;
+  private final InternalChannelz channelz;
   // Only modified in event loop but safe to read any time. Set at startup and unset at shutdown.
   // In the future we may have >1 listen socket.
   private volatile ImmutableList<Instrumented<SocketStats>> listenSockets = ImmutableList.of();
@@ -108,7 +108,7 @@ class NettyServer implements InternalServer, WithLogId {
       long maxConnectionIdleInNanos,
       long maxConnectionAgeInNanos, long maxConnectionAgeGraceInNanos,
       boolean permitKeepAliveWithoutCalls, long permitKeepAliveTimeInNanos,
-      Channelz channelz) {
+      InternalChannelz channelz) {
     this.address = address;
     this.channelType = checkNotNull(channelType, "channelType");
     checkNotNull(channelOptions, "channelOptions");
diff --git a/netty/src/main/java/io/grpc/netty/NettyServerHandler.java b/netty/src/main/java/io/grpc/netty/NettyServerHandler.java
index 85ea6b912..ae5047692 100644
--- a/netty/src/main/java/io/grpc/netty/NettyServerHandler.java
+++ b/netty/src/main/java/io/grpc/netty/NettyServerHandler.java
@@ -31,12 +31,12 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import io.grpc.Attributes;
+import io.grpc.InternalChannelz;
 import io.grpc.InternalMetadata;
 import io.grpc.InternalStatus;
 import io.grpc.Metadata;
 import io.grpc.ServerStreamTracer;
 import io.grpc.Status;
-import io.grpc.internal.Channelz;
 import io.grpc.internal.GrpcUtil;
 import io.grpc.internal.KeepAliveManager;
 import io.grpc.internal.LogExceptionRunnable;
@@ -113,7 +113,7 @@ class NettyServerHandler extends AbstractNettyHandler {
   private final KeepAliveEnforcer keepAliveEnforcer;
   /** Incomplete attributes produced by negotiator. */
   private Attributes negotiationAttributes;
-  private Channelz.Security securityInfo;
+  private InternalChannelz.Security securityInfo;
   /** Completed attributes produced by transportReady. */
   private Attributes attributes;
   private Throwable connectionError;
@@ -507,12 +507,12 @@ class NettyServerHandler extends AbstractNettyHandler {
 
   @Override
   public void handleProtocolNegotiationCompleted(
-      Attributes attrs, Channelz.Security securityInfo) {
+      Attributes attrs, InternalChannelz.Security securityInfo) {
     negotiationAttributes = attrs;
     this.securityInfo = securityInfo;
   }
 
-  Channelz.Security getSecurityInfo() {
+  InternalChannelz.Security getSecurityInfo() {
     return securityInfo;
   }
 
diff --git a/netty/src/main/java/io/grpc/netty/NettyServerTransport.java b/netty/src/main/java/io/grpc/netty/NettyServerTransport.java
index 3b573393c..1c167d595 100644
--- a/netty/src/main/java/io/grpc/netty/NettyServerTransport.java
+++ b/netty/src/main/java/io/grpc/netty/NettyServerTransport.java
@@ -22,10 +22,10 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import io.grpc.InternalChannelz.SocketStats;
+import io.grpc.LogId;
 import io.grpc.ServerStreamTracer;
 import io.grpc.Status;
-import io.grpc.internal.Channelz.SocketStats;
-import io.grpc.internal.LogId;
 import io.grpc.internal.ServerTransport;
 import io.grpc.internal.ServerTransportListener;
 import io.grpc.internal.TransportTracer;
diff --git a/netty/src/main/java/io/grpc/netty/NettySocketSupport.java b/netty/src/main/java/io/grpc/netty/NettySocketSupport.java
index cbe882d30..528a3978c 100644
--- a/netty/src/main/java/io/grpc/netty/NettySocketSupport.java
+++ b/netty/src/main/java/io/grpc/netty/NettySocketSupport.java
@@ -18,7 +18,7 @@ package io.grpc.netty;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
-import io.grpc.internal.Channelz.TcpInfo;
+import io.grpc.InternalChannelz.TcpInfo;
 import io.netty.channel.Channel;
 import java.util.Map;
 import javax.annotation.Nullable;
diff --git a/netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java b/netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java
index a9245faf0..356cae0ea 100644
--- a/netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java
+++ b/netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java
@@ -25,9 +25,9 @@ import io.grpc.Attributes;
 import io.grpc.CallCredentials;
 import io.grpc.Grpc;
 import io.grpc.Internal;
+import io.grpc.InternalChannelz;
 import io.grpc.SecurityLevel;
 import io.grpc.Status;
-import io.grpc.internal.Channelz;
 import io.grpc.internal.GrpcUtil;
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelFuture;
@@ -158,7 +158,7 @@ public final class ProtocolNegotiators {
                     .set(Grpc.TRANSPORT_ATTR_SSL_SESSION, session)
                     .set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, ctx.channel().remoteAddress())
                     .build(),
-                new Channelz.Security(new Channelz.Tls(session)));
+                new InternalChannelz.Security(new InternalChannelz.Tls(session)));
             // Replace this handler with the GRPC handler.
             ctx.pipeline().replace(this, null, grpcHandler);
           } else {
@@ -649,7 +649,7 @@ public final class ProtocolNegotiators {
                     .set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, ctx.channel().remoteAddress())
                     .set(CallCredentials.ATTR_SECURITY_LEVEL, SecurityLevel.PRIVACY_AND_INTEGRITY)
                     .build(),
-                new Channelz.Security(new Channelz.Tls(session)));
+                new InternalChannelz.Security(new InternalChannelz.Tls(session)));
             writeBufferedAndRemove(ctx);
           } else {
             Exception ex = new Exception(
diff --git a/netty/src/main/java/io/grpc/netty/Utils.java b/netty/src/main/java/io/grpc/netty/Utils.java
index 4e088c930..327659222 100644
--- a/netty/src/main/java/io/grpc/netty/Utils.java
+++ b/netty/src/main/java/io/grpc/netty/Utils.java
@@ -25,10 +25,10 @@ import static io.netty.util.CharsetUtil.UTF_8;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import io.grpc.InternalChannelz;
 import io.grpc.InternalMetadata;
 import io.grpc.Metadata;
 import io.grpc.Status;
-import io.grpc.internal.Channelz;
 import io.grpc.internal.GrpcUtil;
 import io.grpc.internal.SharedResourceHolder.Resource;
 import io.grpc.netty.GrpcHttp2HeadersUtils.GrpcHttp2InboundHeaders;
@@ -209,9 +209,9 @@ class Utils {
     }
   }
 
-  static Channelz.SocketOptions getSocketOptions(Channel channel) {
+  static InternalChannelz.SocketOptions getSocketOptions(Channel channel) {
     ChannelConfig config = channel.config();
-    Channelz.SocketOptions.Builder b = new Channelz.SocketOptions.Builder();
+    InternalChannelz.SocketOptions.Builder b = new InternalChannelz.SocketOptions.Builder();
 
     // The API allows returning null but not sure if it can happen in practice.
     // Let's be paranoid and do null checking just in case.
diff --git a/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java b/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java
index d8d891e52..5ec8d0fa6 100644
--- a/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java
+++ b/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java
@@ -40,6 +40,7 @@ import com.google.common.util.concurrent.SettableFuture;
 import io.grpc.Attributes;
 import io.grpc.CallOptions;
 import io.grpc.Grpc;
+import io.grpc.InternalChannelz;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.MethodDescriptor.Marshaller;
@@ -47,7 +48,6 @@ import io.grpc.ServerStreamTracer;
 import io.grpc.Status;
 import io.grpc.Status.Code;
 import io.grpc.StatusException;
-import io.grpc.internal.Channelz;
 import io.grpc.internal.ClientStream;
 import io.grpc.internal.ClientStreamListener;
 import io.grpc.internal.ClientTransport;
@@ -107,7 +107,7 @@ public class NettyClientTransportTest {
   private final List<NettyClientTransport> transports = new ArrayList<NettyClientTransport>();
   private final NioEventLoopGroup group = new NioEventLoopGroup(1);
   private final EchoServerListener serverListener = new EchoServerListener();
-  private final Channelz channelz = new Channelz();
+  private final InternalChannelz channelz = new InternalChannelz();
   private Runnable tooManyPingsRunnable = new Runnable() {
     // Throwing is useless in this method, because Netty doesn't propagate the exception
     @Override public void run() {}
diff --git a/netty/src/test/java/io/grpc/netty/NettyHandlerTestBase.java b/netty/src/test/java/io/grpc/netty/NettyHandlerTestBase.java
index 8800f0108..260af1c05 100644
--- a/netty/src/test/java/io/grpc/netty/NettyHandlerTestBase.java
+++ b/netty/src/test/java/io/grpc/netty/NettyHandlerTestBase.java
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import io.grpc.internal.Channelz.TransportStats;
+import io.grpc.InternalChannelz.TransportStats;
 import io.grpc.internal.FakeClock;
 import io.grpc.internal.MessageFramer;
 import io.grpc.internal.StatsTraceContext;
diff --git a/netty/src/test/java/io/grpc/netty/NettyServerTest.java b/netty/src/test/java/io/grpc/netty/NettyServerTest.java
index 5c9c98012..364934cdf 100644
--- a/netty/src/test/java/io/grpc/netty/NettyServerTest.java
+++ b/netty/src/test/java/io/grpc/netty/NettyServerTest.java
@@ -18,16 +18,16 @@ package io.grpc.netty;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.truth.Truth.assertThat;
-import static io.grpc.internal.Channelz.id;
+import static io.grpc.InternalChannelz.id;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
 import com.google.common.util.concurrent.SettableFuture;
+import io.grpc.Instrumented;
+import io.grpc.InternalChannelz;
+import io.grpc.InternalChannelz.SocketStats;
 import io.grpc.ServerStreamTracer;
-import io.grpc.internal.Channelz;
-import io.grpc.internal.Channelz.SocketStats;
-import io.grpc.internal.Instrumented;
 import io.grpc.internal.ServerListener;
 import io.grpc.internal.ServerTransport;
 import io.grpc.internal.ServerTransportListener;
@@ -43,14 +43,13 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
 public class NettyServerTest {
-  private final Channelz channelz = new Channelz();
+  private final InternalChannelz channelz = new InternalChannelz();
 
   @Test
   public void getPort() throws Exception {
diff --git a/netty/src/test/java/io/grpc/netty/UtilsTest.java b/netty/src/test/java/io/grpc/netty/UtilsTest.java
index 4fc186aa5..4c4bdb986 100644
--- a/netty/src/test/java/io/grpc/netty/UtilsTest.java
+++ b/netty/src/test/java/io/grpc/netty/UtilsTest.java
@@ -22,10 +22,10 @@ import static org.junit.Assert.assertSame;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.truth.Truth;
+import io.grpc.InternalChannelz;
+import io.grpc.InternalChannelz.SocketOptions;
 import io.grpc.Metadata;
 import io.grpc.Status;
-import io.grpc.internal.Channelz;
-import io.grpc.internal.Channelz.SocketOptions;
 import io.grpc.internal.GrpcUtil;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelOption;
@@ -131,7 +131,7 @@ public class UtilsTest {
   public void channelOptionsTest_noLinger() {
     Channel channel = new EmbeddedChannel();
     assertNull(channel.config().getOption(ChannelOption.SO_LINGER));
-    Channelz.SocketOptions socketOptions = Utils.getSocketOptions(channel);
+    InternalChannelz.SocketOptions socketOptions = Utils.getSocketOptions(channel);
     assertNull(socketOptions.lingerSeconds);
   }
 
@@ -149,7 +149,7 @@ public class UtilsTest {
     assertNull(socketOptions.soTimeoutMillis);
   }
 
-  private static Channelz.SocketOptions setAndValidateGeneric(Channel channel) {
+  private static InternalChannelz.SocketOptions setAndValidateGeneric(Channel channel) {
     channel.config().setOption(ChannelOption.SO_LINGER, 3);
     // only applicable for OIO channels:
     channel.config().setOption(ChannelOption.SO_TIMEOUT, 250);
@@ -158,7 +158,7 @@ public class UtilsTest {
     WriteBufferWaterMark writeBufWaterMark = new WriteBufferWaterMark(10, 20);
     channel.config().setOption(ChannelOption.WRITE_BUFFER_WATER_MARK, writeBufWaterMark);
 
-    Channelz.SocketOptions socketOptions = Utils.getSocketOptions(channel);
+    InternalChannelz.SocketOptions socketOptions = Utils.getSocketOptions(channel);
     assertEquals(3, (int) socketOptions.lingerSeconds);
     assertEquals("true", socketOptions.others.get("SO_KEEPALIVE"));
     assertEquals(