From c2b74f7468da2c462f9c85cc4cf79e3ec9dc2ec7 Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Thu, 7 Nov 2019 09:59:00 -0800 Subject: [PATCH] xds: set client node.BuildVersion to gRPC version (#3140) --- xds/internal/client/config.go | 4 ++++ xds/internal/client/config_test.go | 1 + 2 files changed, 5 insertions(+) diff --git a/xds/internal/client/config.go b/xds/internal/client/config.go index 1a7b1d2c..4438bb6f 100644 --- a/xds/internal/client/config.go +++ b/xds/internal/client/config.go @@ -23,6 +23,7 @@ package client import ( "bytes" "encoding/json" + "fmt" "io/ioutil" "os" @@ -40,6 +41,8 @@ const ( googleDefaultCreds = "google_default" ) +var gRPCVersion = fmt.Sprintf("gRPC-Go %s", grpc.Version) + // For overriding from unit tests. var fileReadFunc = ioutil.ReadFile @@ -124,6 +127,7 @@ func NewConfig() *Config { grpclog.Errorf("xds: jsonpb.Unmarshal(%v) failed during bootstrap: %v", string(v), err) break } + n.BuildVersion = gRPCVersion config.NodeProto = n case "xds_server": xs := &xdsServer{} diff --git a/xds/internal/client/config_test.go b/xds/internal/client/config_test.go index e6f908c0..f8c482aa 100644 --- a/xds/internal/client/config_test.go +++ b/xds/internal/client/config_test.go @@ -39,6 +39,7 @@ var ( }, }, }, + BuildVersion: gRPCVersion, } nilCredsConfig = &Config{ BalancerName: "trafficdirector.googleapis.com:443",