vendor: add go-grpc-middleware

Rebased to master PR etcd-io#9994.  Fixed a Go format issue in
v3rpc/interceptor.go.  Updated vendor to include go-grpc-middleware.

bill-of-materials.json

@@ -336,6 +336,33 @@
 			}
 		]
 	},
+	{
+		"project": "go.uber.org/atomic",
+		"licenses": [
+			{
+				"type": "MIT License",
+				"confidence": 0.9891304347826086
+			}
+		]
+	},
+	{
+		"project": "go.uber.org/multierr",
+		"licenses": [
+			{
+				"type": "MIT License",
+				"confidence": 0.9891304347826086
+			}
+		]
+	},
+	{
+		"project": "go.uber.org/zap",
+		"licenses": [
+			{
+				"type": "MIT License",
+				"confidence": 0.9891304347826086
+			}
+		]
+	},
 	{
 		"project": "golang.org/x/crypto",
 		"licenses": [

etcdserver/api/v3rpc/interceptor.go

@@ -65,7 +65,7 @@ func newLogUnaryInterceptor(s *etcdserver.EtcdServer) grpc.UnaryServerIntercepto
 	return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
 		startTime := time.Now()
 		resp, err := handler(ctx, req)
-		defer logUnaryRequestStats(ctx, s.Logger(), info, startTime, req, resp)
+		defer logUnaryRequestStats(ctx, nil, info, startTime, req, resp)
 		return resp, err
 	}
 }
@@ -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,
 		)

etcdserver/server.go

@@ -1741,7 +1741,3 @@ func (s *EtcdServer) goAttach(f func()) {
 func (s *EtcdServer) Alarms() []*pb.AlarmMember {
 	return s.alarmStore.Get(pb.AlarmType_NONE)
 }
-
-func (s *EtcdServer) Logger() *zap.Logger {
-	return s.lg
-}