From d58f9718951ba8f5847f3c5d68b542079dc58a61 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Mon, 4 Apr 2022 15:45:59 +0200 Subject: [PATCH] tests: Use zaptest.NewLogger in places we missed --- client/pkg/fileutil/purge_test.go | 6 +++--- client/pkg/transport/listener_test.go | 5 ++--- client/v3/config_test.go | 3 ++- pkg/go.mod | 1 + pkg/go.sum | 1 + pkg/traceutil/trace_test.go | 6 +++--- server/etcdserver/zap_raft_test.go | 2 +- tools/etcd-dump-metrics/main.go | 9 +++++++-- 8 files changed, 20 insertions(+), 13 deletions(-) diff --git a/client/pkg/fileutil/purge_test.go b/client/pkg/fileutil/purge_test.go index bafa11af7..a10a3283b 100644 --- a/client/pkg/fileutil/purge_test.go +++ b/client/pkg/fileutil/purge_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "go.uber.org/zap" + "go.uber.org/zap/zaptest" ) func TestPurgeFile(t *testing.T) { @@ -40,7 +40,7 @@ func TestPurgeFile(t *testing.T) { stop, purgec := make(chan struct{}), make(chan string, 10) // keep 3 most recent files - errch := purgeFile(zap.NewExample(), dir, "test", 3, time.Millisecond, stop, purgec, nil) + errch := purgeFile(zaptest.NewLogger(t), dir, "test", 3, time.Millisecond, stop, purgec, nil) select { case f := <-purgec: t.Errorf("unexpected purge on %q", f) @@ -107,7 +107,7 @@ func TestPurgeFileHoldingLockFile(t *testing.T) { } stop, purgec := make(chan struct{}), make(chan string, 10) - errch := purgeFile(zap.NewExample(), dir, "test", 3, time.Millisecond, stop, purgec, nil) + errch := purgeFile(zaptest.NewLogger(t), dir, "test", 3, time.Millisecond, stop, purgec, nil) for i := 0; i < 5; i++ { select { diff --git a/client/pkg/transport/listener_test.go b/client/pkg/transport/listener_test.go index b49e56fc7..ed64b7bf3 100644 --- a/client/pkg/transport/listener_test.go +++ b/client/pkg/transport/listener_test.go @@ -24,7 +24,6 @@ import ( "testing" "time" - "go.uber.org/zap" "go.uber.org/zap/zaptest" ) @@ -34,7 +33,7 @@ func createSelfCert(t *testing.T, hosts ...string) (*TLSInfo, error) { func createSelfCertEx(t *testing.T, host string, additionalUsages ...x509.ExtKeyUsage) (*TLSInfo, error) { d := t.TempDir() - info, err := SelfCert(zap.NewExample(), d, []string{host + ":0"}, 1, additionalUsages...) + info, err := SelfCert(zaptest.NewLogger(t), d, []string{host + ":0"}, 1, additionalUsages...) if err != nil { return nil, err } @@ -520,7 +519,7 @@ func TestNewListenerUnixSocket(t *testing.T) { // TestNewListenerTLSInfoSelfCert tests that a new certificate accepts connections. func TestNewListenerTLSInfoSelfCert(t *testing.T) { tmpdir := t.TempDir() - tlsinfo, err := SelfCert(zap.NewExample(), tmpdir, []string{"127.0.0.1"}, 1) + tlsinfo, err := SelfCert(zaptest.NewLogger(t), tmpdir, []string{"127.0.0.1"}, 1) if err != nil { t.Fatal(err) } diff --git a/client/v3/config_test.go b/client/v3/config_test.go index da8d3be56..0fec4c25c 100644 --- a/client/v3/config_test.go +++ b/client/v3/config_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/client/pkg/v3/logutil" "go.etcd.io/etcd/client/pkg/v3/transport" "go.uber.org/zap" ) @@ -111,7 +112,7 @@ func TestNewClientConfig(t *testing.T) { for _, tc := range cases { t.Run(tc.name, func(t *testing.T) { - lg, _ := zap.NewProduction() + lg, _ := logutil.CreateDefaultZapLogger(zap.InfoLevel) cfg, err := NewClientConfig(&tc.spec, lg) if err != nil { diff --git a/pkg/go.mod b/pkg/go.mod index 03f646109..2f323db3a 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -15,6 +15,7 @@ require ( ) require ( + github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect diff --git a/pkg/go.sum b/pkg/go.sum index c03af2528..8cef5c547 100644 --- a/pkg/go.sum +++ b/pkg/go.sum @@ -11,6 +11,7 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= diff --git a/pkg/traceutil/trace_test.go b/pkg/traceutil/trace_test.go index 8b8b67d0f..5b654cc0b 100644 --- a/pkg/traceutil/trace_test.go +++ b/pkg/traceutil/trace_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "go.uber.org/zap" + "go.etcd.io/etcd/client/pkg/v3/logutil" ) func TestGet(t *testing.T) { @@ -204,7 +204,7 @@ func TestLog(t *testing.T) { logPath := filepath.Join(os.TempDir(), fmt.Sprintf("test-log-%d", time.Now().UnixNano())) defer os.RemoveAll(logPath) - lcfg := zap.NewProductionConfig() + lcfg := logutil.DefaultZapLoggerConfig lcfg.OutputPaths = []string{logPath} lcfg.ErrorOutputPaths = []string{logPath} lg, _ := lcfg.Build() @@ -285,7 +285,7 @@ func TestLogIfLong(t *testing.T) { logPath := filepath.Join(os.TempDir(), fmt.Sprintf("test-log-%d", time.Now().UnixNano())) defer os.RemoveAll(logPath) - lcfg := zap.NewProductionConfig() + lcfg := logutil.DefaultZapLoggerConfig lcfg.OutputPaths = []string{logPath} lcfg.ErrorOutputPaths = []string{logPath} lg, _ := lcfg.Build() diff --git a/server/etcdserver/zap_raft_test.go b/server/etcdserver/zap_raft_test.go index c5fbd2c81..564140575 100644 --- a/server/etcdserver/zap_raft_test.go +++ b/server/etcdserver/zap_raft_test.go @@ -75,7 +75,7 @@ func TestNewRaftLoggerFromZapCore(t *testing.T) { buf := bytes.NewBuffer(nil) syncer := zapcore.AddSync(buf) cr := zapcore.NewCore( - zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig()), + zapcore.NewJSONEncoder(logutil.DefaultZapLoggerConfig.EncoderConfig), syncer, zap.NewAtomicLevelAt(zap.InfoLevel), ) diff --git a/tools/etcd-dump-metrics/main.go b/tools/etcd-dump-metrics/main.go index ab3e15819..ac97d5b86 100644 --- a/tools/etcd-dump-metrics/main.go +++ b/tools/etcd-dump-metrics/main.go @@ -24,6 +24,7 @@ import ( "path/filepath" "time" + "go.etcd.io/etcd/client/pkg/v3/logutil" "go.etcd.io/etcd/server/v3/embed" "go.uber.org/zap" @@ -33,7 +34,7 @@ var lg *zap.Logger func init() { var err error - lg, err = zap.NewProduction() + lg, err = logutil.CreateDefaultZapLogger(zap.InfoLevel) if err != nil { panic(err) } @@ -49,7 +50,11 @@ func main() { panic("specify either 'addr' or 'download-ver'") } if *debug { - lg = zap.NewExample() + var err error + lg, err = logutil.CreateDefaultZapLogger(zap.DebugLevel) + if err != nil { + panic(err) + } } ep := *addr