move channelz back to the abstract class

Author: sergiitk

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

@@ -276,7 +276,7 @@ final List<? extends ServerStreamTracer.Factory> getTracerFactories() {
     return Collections.unmodifiableList(tracerFactories);
   }
 
-  protected final InternalChannelz getChannelz() {
+  protected InternalChannelz getChannelz() {
     return channelz;
   }
 

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

@@ -18,6 +18,7 @@
 
 import com.google.common.base.Preconditions;
 import io.grpc.Deadline;
+import io.grpc.InternalChannelz;
 import io.grpc.ServerBuilder;
 import io.grpc.ServerStreamTracer;
 import java.io.File;
@@ -85,6 +86,11 @@ public void setStatsRecordRealTimeMetrics(boolean value) {
     super.setStatsRecordRealTimeMetrics(value);
   }
 
+  @Override
+  public InternalChannelz getChannelz() {
+    return super.getChannelz();
+  }
+
   @Override
   public ObjectPool<? extends Executor> getExecutorPool() {
     return super.getExecutorPool();

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

@@ -29,7 +29,6 @@
 import io.grpc.ExperimentalApi;
 import io.grpc.ForwardingServerBuilder;
 import io.grpc.Internal;
-import io.grpc.InternalChannelz;
 import io.grpc.ServerBuilder;
 import io.grpc.ServerStreamTracer;
 import io.grpc.internal.FixedObjectPool;
@@ -90,8 +89,6 @@ public final class NettyServerBuilder extends ForwardingServerBuilder<NettyServe
   private final List<SocketAddress> listenAddresses = new ArrayList<>();
 
   private TransportTracer.Factory transportTracerFactory = TransportTracer.getDefaultFactory();
-  private InternalChannelz channelz = InternalChannelz.instance();
-
   private ChannelFactory<? extends ServerChannel> channelFactory =
       Utils.DEFAULT_SERVER_CHANNEL_FACTORY;
   private final Map<ChannelOption<?>, Object> channelOptions = new HashMap<>();
@@ -606,7 +603,7 @@ List<NettyServer> buildTransportServers(
           keepAliveTimeInNanos, keepAliveTimeoutInNanos,
           maxConnectionIdleInNanos, maxConnectionAgeInNanos,
           maxConnectionAgeGraceInNanos, permitKeepAliveWithoutCalls, permitKeepAliveTimeInNanos,
-          channelz);
+          this.serverImplBuilder.getChannelz());
       transportServers.add(transportServer);
     }
     return Collections.unmodifiableList(transportServers);