Merge pull request #12948 from serathius/logger

client: Allow setting zap logger in config

tests/integration/clientv3/connectivity/network_partition_test.go

@@ -119,13 +119,13 @@ func testBalancerUnderNetworkPartition(t *testing.T, op func(*clientv3.Client, c
 		Endpoints:   []string{eps[0]},
 		DialTimeout: 3 * time.Second,
 		DialOptions: []grpc.DialOption{grpc.WithBlock()},
+		Logger:      zaptest.NewLogger(t).Named("client"),
 	}
 	cli, err := integration.NewClient(t, ccfg)
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer cli.Close()
-	cli = cli.WithLogger(zaptest.NewLogger(t).Named("client"))
 	// wait for eps[0] to be pinned
 	clientv3test.MustWaitPinReady(t, cli)
 

tests/integration/cluster_direct.go

@@ -41,9 +41,6 @@ func toGRPC(c *clientv3.Client) grpcAPI {
 }
 
 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
+	cfg.Logger = lg
+	return clientv3.New(cfg)
 }

tests/integration/cluster_proxy.go

@@ -109,11 +109,11 @@ func (pc *proxyCloser) Close() error {
 }
 
 func newClientV3(cfg clientv3.Config, lg *zap.Logger) (*clientv3.Client, error) {
+	cfg.Logger = lg
 	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()

tests/integration/embed/embed_test.go

@@ -35,7 +35,6 @@ import (
 	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/server/v3/embed"
 	"go.etcd.io/etcd/tests/v3/integration"
-	"go.uber.org/zap/zaptest"
 )
 
 var (
@@ -167,8 +166,6 @@ func testEmbedEtcdGracefulStop(t *testing.T, secure bool) {
 	}
 	defer cli.Close()
 
-	cli = cli.WithLogger(zaptest.NewLogger(t))
-
 	// open watch connection
 	cli.Watch(context.Background(), "foo")
 

tests/integration/testing.go

@@ -73,9 +73,8 @@ func NewEmbedConfig(t testing.TB, name string) *embed.Config {
 }
 
 func NewClient(t testing.TB, cfg clientv3.Config) (*clientv3.Client, error) {
-	client, err := clientv3.New(cfg)
-	if err != nil {
-		return nil, err
+	if cfg.Logger != nil {
+		cfg.Logger = zaptest.NewLogger(t)
 	}
-	return client.WithLogger(zaptest.NewLogger(t)), nil
+	return clientv3.New(cfg)
 }