[admin_api] nomap

admin/admin.go

@@ -37,7 +37,7 @@ import (
 func init() {
 	// Add a list of default services to admin here. Optional services, like
 	// CSDS, will be added by other packages.
-	internaladmin.AddService("channelz", func(registrar grpc.ServiceRegistrar) (func(), error) {
+	internaladmin.AddService(func(registrar grpc.ServiceRegistrar) (func(), error) {
 		channelzservice.RegisterChannelzServiceToServer(registrar)
 		return nil, nil
 	})

internal/admin/admin.go

@@ -21,18 +21,18 @@ package admin
 
 import "google.golang.org/grpc"
 
-var (
-	// services is a map from name to service register functions.
-	services = make(map[string]func(grpc.ServiceRegistrar) (func(), error))
-)
+// services is a map from name to service register functions.
+var services []func(grpc.ServiceRegistrar) (func(), error)
 
 // AddService adds a service to the list of admin services.
 //
 // NOTE: this function must only be called during initialization time (i.e. in
-// an init() function), and is not thread-safe. If multiple services are added
-// with the same name, the one added last will take effect.
-func AddService(name string, f func(grpc.ServiceRegistrar) (func(), error)) {
-	services[name] = f
+// an init() function), and is not thread-safe.
+//
+// If multiple services with the same service name are added (e.g. two services
+// for `grpc.channelz.v1.Channelz`), the server will panic on `Register()`.
+func AddService(f func(grpc.ServiceRegistrar) (func(), error)) {
+	services = append(services, f)
 }
 
 // Register registers the set of admin services to the given server.

xds/xds.go

@@ -44,7 +44,7 @@ import (
 )
 
 func init() {
-	internaladmin.AddService("csds", func(registrar grpc.ServiceRegistrar) (func(), error) {
+	internaladmin.AddService(func(registrar grpc.ServiceRegistrar) (func(), error) {
 		var grpcServer *grpc.Server
 		switch ss := registrar.(type) {
 		case *grpc.Server: