From 93e9f23562700410cca770b545f69ed7eb317db2 Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Mon, 5 Apr 2021 13:56:00 -0700 Subject: [PATCH 1/2] xds/interop: register admin services and reflection (#4307) --- interop/xds/client/client.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/interop/xds/client/client.go b/interop/xds/client/client.go index 5b755272d3e7..b028ec79228e 100644 --- a/interop/xds/client/client.go +++ b/interop/xds/client/client.go @@ -31,9 +31,11 @@ import ( "time" "google.golang.org/grpc" + "google.golang.org/grpc/admin" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/peer" + "google.golang.org/grpc/reflection" "google.golang.org/grpc/status" _ "google.golang.org/grpc/xds" @@ -370,6 +372,12 @@ func main() { defer s.Stop() testgrpc.RegisterLoadBalancerStatsServiceServer(s, &statsService{}) testgrpc.RegisterXdsUpdateClientConfigureServiceServer(s, &configureService{}) + reflection.Register(s) + cleanup, err := admin.Register(s) + if err != nil { + logger.Fatalf("failed to register admin: %v", err) + } + defer cleanup() go s.Serve(lis) clients := make([]testgrpc.TestServiceClient, *numChannels) From a1a9fc99595c189cfe17e2d8e5025c415c9c2b0e Mon Sep 17 00:00:00 2001 From: menghanl Date: Wed, 31 Mar 2021 10:01:32 -0700 Subject: [PATCH 2/2] Change version to 1.37.0 [skip ci] Skipping Travis. Version number change only --- version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.go b/version.go index c149b22ad8a1..c3b87eb5ac87 100644 --- a/version.go +++ b/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.37.0-dev" +const Version = "1.37.0"