diff --git a/tests/integration/cluster.go b/tests/integration/cluster.go index 982971f83ae..1291b8b724a 100644 --- a/tests/integration/cluster.go +++ b/tests/integration/cluster.go @@ -777,11 +777,7 @@ func NewClientV3(m *member) (*clientv3.Client, error) { if m.DialOptions != nil { cfg.DialOptions = append(cfg.DialOptions, m.DialOptions...) } - c, err := newClientV3(cfg) - if err != nil { - return nil, err - } - return c.WithLogger(m.Logger.Named("client")), nil + return newClientV3(cfg, m.Logger.Named("client")) } // Clone returns a member with the same server configuration. The returned diff --git a/tests/integration/cluster_direct.go b/tests/integration/cluster_direct.go index 0334146d066..a7070de0e70 100644 --- a/tests/integration/cluster_direct.go +++ b/tests/integration/cluster_direct.go @@ -22,6 +22,7 @@ import ( "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" + "go.uber.org/zap" ) const ThroughProxy = false @@ -39,6 +40,10 @@ func toGRPC(c *clientv3.Client) grpcAPI { } } -func newClientV3(cfg clientv3.Config) (*clientv3.Client, error) { - return clientv3.New(cfg) +func newClientV3(cfg clientv3.Config, lg *zap.Logger) (*clientv3.Client, error) { + c, err := clientv3.New(cfg) + if err != nil { + return nil, err + } + return c.WithLogger(lg), nil } diff --git a/tests/integration/cluster_proxy.go b/tests/integration/cluster_proxy.go index 4a9d26aba63..97a9808e634 100644 --- a/tests/integration/cluster_proxy.go +++ b/tests/integration/cluster_proxy.go @@ -25,7 +25,6 @@ import ( "go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/server/v3/proxy/grpcproxy" "go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter" - "go.uber.org/zap" ) @@ -56,7 +55,7 @@ func toGRPC(c *clientv3.Client) grpcAPI { // TODO: Refactor to a separate clientv3.Client instance instead of the context alone. ctx, ctxCancel := context.WithCancel(context.WithValue(context.TODO(), "_name", "grpcProxyContext")) - lg := zap.NewExample() + lg := c.GetLogger() if v, ok := proxies[c]; ok { return v.grpc @@ -109,11 +108,12 @@ func (pc *proxyCloser) Close() error { return err } -func newClientV3(cfg clientv3.Config) (*clientv3.Client, error) { +func newClientV3(cfg clientv3.Config, lg *zap.Logger) (*clientv3.Client, error) { c, err := clientv3.New(cfg) if err != nil { return nil, err } + c = c.WithLogger(lg) rpc := toGRPC(c) c.KV = clientv3.NewKVFromKVClient(rpc.KV, c) pmu.Lock()