From 5828efda38e0fae6ed8ac6cb38467149f3262ad1 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Wed, 2 May 2018 13:26:39 -0700
Subject: [PATCH] *: use "zap.Field"

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 embed/etcd.go         | 4 +---
 etcdserver/corrupt.go | 3 +--
 etcdserver/server.go  | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/embed/etcd.go b/embed/etcd.go
index 1206a8882..397516ea0 100644
--- a/embed/etcd.go
+++ b/embed/etcd.go
@@ -28,8 +28,6 @@ import (
 	"sync"
 	"time"
 
-	"go.uber.org/zap/zapcore"
-
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/api/etcdhttp"
 	"github.com/coreos/etcd/etcdserver/api/v2http"
@@ -275,7 +273,7 @@ func (e *Etcd) Config() Config {
 // Client requests will be terminated with request timeout.
 // After timeout, enforce remaning requests be closed immediately.
 func (e *Etcd) Close() {
-	fields := []zapcore.Field{
+	fields := []zap.Field{
 		zap.String("name", e.cfg.Name),
 		zap.String("data-dir", e.cfg.Dir),
 		zap.Strings("advertise-peer-urls", e.cfg.getAPURLs()),
diff --git a/etcdserver/corrupt.go b/etcdserver/corrupt.go
index 5c88d355d..d4cd9f2e6 100644
--- a/etcdserver/corrupt.go
+++ b/etcdserver/corrupt.go
@@ -26,7 +26,6 @@ import (
 	"github.com/coreos/etcd/pkg/types"
 
 	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 )
 
 // CheckInitialHashKV compares initial hash values with its peers
@@ -58,7 +57,7 @@ func (s *EtcdServer) CheckInitialHashKV() error {
 	for _, p := range peers {
 		if p.resp != nil {
 			peerID := types.ID(p.resp.Header.MemberId)
-			fields := []zapcore.Field{
+			fields := []zap.Field{
 				zap.String("local-member-id", s.ID().String()),
 				zap.Int64("local-member-revision", rev),
 				zap.Int64("local-member-compact-revision", crev),
diff --git a/etcdserver/server.go b/etcdserver/server.go
index 0bf9f00f7..eb2ce8616 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -61,7 +61,6 @@ import (
 	"github.com/coreos/go-semver/semver"
 	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 )
 
 const (
@@ -1816,7 +1815,7 @@ func (s *EtcdServer) sendMergedSnap(merged raftsnap.Message) {
 	atomic.AddInt64(&s.inflightSnapshots, 1)
 
 	lg := s.getLogger()
-	fields := []zapcore.Field{
+	fields := []zap.Field{
 		zap.String("from", s.ID().String()),
 		zap.String("to", types.ID(merged.To).String()),
 		zap.Int64("bytes", merged.TotalSize),