channelz: turn on channelz when importing service package, delete RegisterChannelz from grpc package (#2277)

benchmark/benchmain/main.go

@@ -66,6 +66,7 @@ import (
 	"google.golang.org/grpc/benchmark/latency"
 	"google.golang.org/grpc/benchmark/stats"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/channelz"
 	"google.golang.org/grpc/test/bufconn"
 )
 
@@ -452,7 +453,7 @@ func main() {
 
 		grpc.EnableTracing = enableTrace[featuresPos[0]]
 		if enableChannelz[featuresPos[8]] {
-			grpc.RegisterChannelz()
+			channelz.TurnOn()
 		}
 		if runMode[0] {
 			unaryBenchmark(startTimer, stopTimer, benchFeature, benchtime, s)

channelz/service/service.go

@@ -37,6 +37,10 @@ import (
 	"google.golang.org/grpc/internal/channelz"
 )
 
+func init() {
+	channelz.TurnOn()
+}
+
 func convertToPtypesDuration(sec int64, usec int64) *durpb.Duration {
 	return ptypes.DurationProto(time.Duration(sec*1e9 + usec*1e3))
 }

clientconn.go

@@ -101,12 +101,6 @@ const (
 	defaultReadBufSize  = 32 * 1024
 )
 
-// RegisterChannelz turns on channelz service.
-// This is an EXPERIMENTAL API.
-func RegisterChannelz() {
-	channelz.TurnOn()
-}
-
 // Dial creates a client connection to the given target.
 func Dial(target string, opts ...DialOption) (*ClientConn, error) {
 	return DialContext(context.Background(), target, opts...)

test/end2end_test.go

@@ -56,6 +56,7 @@ import (
 	"google.golang.org/grpc/health"
 	healthgrpc "google.golang.org/grpc/health/grpc_health_v1"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
+	"google.golang.org/grpc/internal/channelz"
 	"google.golang.org/grpc/internal/leakcheck"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/metadata"
@@ -71,7 +72,7 @@ import (
 )
 
 func init() {
-	grpc.RegisterChannelz()
+	channelz.TurnOn()
 }
 
 var (