Simplify client's logger configuration in tests.

client/v3/client_test.go

@@ -30,7 +30,9 @@ import (
 )
 
 func NewClient(t *testing.T, cfg Config) (*Client, error) {
-	cfg.Logger = zaptest.NewLogger(t)
+	if cfg.Logger == nil {
+		cfg.Logger = zaptest.NewLogger(t).Named("client")
+	}
 	return New(cfg)
 }
 

tests/integration/clientv3/connectivity/network_partition_test.go

@@ -28,7 +28,6 @@ import (
 	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/tests/v3/integration"
 	"go.etcd.io/etcd/tests/v3/integration/clientv3"
-	"go.uber.org/zap/zaptest"
 	"google.golang.org/grpc"
 )
 
@@ -119,7 +118,6 @@ 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 {

tests/integration/clientv3/kv_test.go

@@ -1118,6 +1118,7 @@ func TestBalancerSupportLearner(t *testing.T) {
 	if _, err := cli.Get(context.Background(), "foo"); err == nil {
 		t.Fatalf("expect Get request to learner to fail, got no error")
 	}
+	t.Logf("Expected: Read from learner error: %v", err)
 
 	eps := []string{learnerEp, clus.Members[0].GRPCAddr()}
 	cli.SetEndpoints(eps...)

tests/integration/cluster.go

@@ -773,6 +773,7 @@ func NewClientV3(m *member) (*clientv3.Client, error) {
 		DialOptions:        []grpc.DialOption{grpc.WithBlock()},
 		MaxCallSendMsgSize: m.clientMaxCallSendMsgSize,
 		MaxCallRecvMsgSize: m.clientMaxCallRecvMsgSize,
+		Logger:             m.Logger.Named("client"),
 	}
 
 	if m.ClientTLSInfo != nil {
@@ -785,7 +786,7 @@ func NewClientV3(m *member) (*clientv3.Client, error) {
 	if m.DialOptions != nil {
 		cfg.DialOptions = append(cfg.DialOptions, m.DialOptions...)
 	}
-	return newClientV3(cfg, m.Logger.Named("client"))
+	return newClientV3(cfg)
 }
 
 // Clone returns a member with the same server configuration. The returned

tests/integration/cluster_direct.go

@@ -22,7 +22,6 @@ 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
@@ -40,7 +39,6 @@ func toGRPC(c *clientv3.Client) grpcAPI {
 	}
 }
 
-func newClientV3(cfg clientv3.Config, lg *zap.Logger) (*clientv3.Client, error) {
-	cfg.Logger = lg
+func newClientV3(cfg clientv3.Config) (*clientv3.Client, error) {
 	return clientv3.New(cfg)
 }

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"
 )
 
 const ThroughProxy = true
@@ -108,8 +107,7 @@ func (pc *proxyCloser) Close() error {
 	return err
 }
 
-func newClientV3(cfg clientv3.Config, lg *zap.Logger) (*clientv3.Client, error) {
-	cfg.Logger = lg
+func newClientV3(cfg clientv3.Config) (*clientv3.Client, error) {
 	c, err := clientv3.New(cfg)
 	if err != nil {
 		return nil, err

tests/integration/testing.go

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