grpclb: sync messages.proto and update client load reporting (#2101)

grpc · Jun 4, 2018 · 70e9c28 · 70e9c28
1 parent 130c87f
commit 70e9c28
Show file tree

Hide file tree

Showing 6 changed files with 334 additions and 426 deletions.
diff --git a/grpclb.go b/grpclb.go
@@ -24,6 +24,7 @@ import (
 	"sync"
 	"time"
 
+	durationpb "github.com/golang/protobuf/ptypes/duration"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/connectivity"
@@ -38,7 +39,7 @@ const (
 	grpclbName             = "grpclb"
 )
 
-func convertDuration(d *lbpb.Duration) time.Duration {
+func convertDuration(d *durationpb.Duration) time.Duration {
 	if d == nil {
 		return 0
 	}
@@ -138,7 +139,7 @@ func (b *lbBuilder) Build(cc balancer.ClientConn, opt balancer.BuildOptions) bal
 		subConns:       make(map[resolver.Address]balancer.SubConn),
 		scStates:       make(map[balancer.SubConn]connectivity.State),
 		picker:         &errPicker{err: balancer.ErrNoSubConnAvailable},
-		clientStats:    &rpcStats{},
+		clientStats:    newRPCStats(),
 	}
 
 	return lb