vendor: add go-grpc-middleware

Rebased to master PR #9994. Fixed a Go format issue in v3rpc/interceptor.go. Updated vendor to include go-grpc-middleware.
etcd-io · Aug 10, 2018 · 3066294 · 3066294
1 parent dc01734
commit 3066294
Show file tree

Hide file tree

Showing 6 changed files with 298 additions and 14 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/bill-of-materials.json b/bill-of-materials.json
@@ -135,7 +135,7 @@
  ]
  },
  {
- "project": "github.com/grpc-ecosystem/go-grpc-middleware/util/backoffutils",
+ "project": "github.com/grpc-ecosystem/go-grpc-middleware",
  "licenses": [
  {
  "type": "Apache License 2.0",

diff --git a/etcdserver/api/v3rpc/interceptor.go b/etcdserver/api/v3rpc/interceptor.go
@@ -78,8 +78,8 @@ func logUnaryRequestStats(ctx context.Context, lg *zap.Logger, info *grpc.UnaryS
  remote = peerInfo.Addr.String()
  }
  var responseType string = info.FullMethod
- var reqCount, respCount int64 = 0, 0
- var reqSize, respSize int = 0, 0
+ var reqCount, respCount int64
+ var reqSize, respSize int
  var reqContent string
  switch _resp := resp.(type) {
  case *pb.RangeResponse:
@@ -152,15 +152,14 @@ func logUnaryRequestStats(ctx context.Context, lg *zap.Logger, info *grpc.UnaryS
 func logGenericRequestStats(lg *zap.Logger, startTime time.Time, duration time.Duration, remote string, responseType string,
  reqCount int64, reqSize int, respCount int64, respSize int, reqContent string) {
  if lg == nil {
- plog.Debugf(
- "start time = %v, " +
- "time spent = %v, " +
- "remote = %s, " +
- "response type = %s, " +
- "request count = %d, " +
- "request size = %d, " +
- "response count = %d, " +
- "response size = %d, " +
+ plog.Debugf("start time = %v, "+
+ "time spent = %v, "+
+ "remote = %s, "+
+ "response type = %s, "+
+ "request count = %d, "+
+ "request size = %d, "+
+ "response count = %d, "+
+ "response size = %d, "+
  "request content = %s",
  startTime, duration, remote, responseType, reqCount, reqSize, respCount, respSize, reqContent,
  )

diff --git a/vendor/github.com/grpc-ecosystem/go-grpc-middleware/chain.go b/vendor/github.com/grpc-ecosystem/go-grpc-middleware/chain.go
diff --git a/vendor/github.com/grpc-ecosystem/go-grpc-middleware/doc.go b/vendor/github.com/grpc-ecosystem/go-grpc-middleware/doc.go
diff --git a/vendor/github.com/grpc-ecosystem/go-grpc-middleware/wrappers.go b/vendor/github.com/grpc-ecosystem/go-grpc-middleware/wrappers.go