From da7e20b83ed88b8423d1eb0a8ef5d54c4c25eeb0 Mon Sep 17 00:00:00 2001
From: lyuxuan <yuxuanli@google.com>
Date: Wed, 29 Aug 2018 11:01:36 -0700
Subject: [PATCH] channelz: turn on channelz when importing service package,
 delete RegisterChannelz from grpc package (#2277)

---
 benchmark/benchmain/main.go | 3 ++-
 channelz/service/service.go | 4 ++++
 clientconn.go               | 6 ------
 test/end2end_test.go        | 3 ++-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/benchmark/benchmain/main.go b/benchmark/benchmain/main.go
index 5a9e478d..5c41c708 100644
--- a/benchmark/benchmain/main.go
+++ b/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)
diff --git a/channelz/service/service.go b/channelz/service/service.go
index a1c45d51..1cc607e6 100644
--- a/channelz/service/service.go
+++ b/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))
 }
diff --git a/clientconn.go b/clientconn.go
index 8ddae3ad..bb6aeb8c 100644
--- a/clientconn.go
+++ b/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...)
diff --git a/test/end2end_test.go b/test/end2end_test.go
index 661a0f4c..1ae04ef7 100644
--- a/test/end2end_test.go
+++ b/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 (