mod tidy

.drone.yml

@@ -3,7 +3,7 @@ name: default
 
 steps:
 - name: test 
-  image: golang:1.14.2
+  image: golang:1.17.1
   volumes:
   - name: deps
     path: /go/src/mod
@@ -11,40 +11,10 @@ steps:
   - go test 
 
 - name: golangci-lint
-  image: golangci/golangci-lint:v1.29
+  image: golangci/golangci-lint:v1.42
   commands:
   - golangci-lint run
 
-- name: logrus golangci-lint
-  image: golangci/golangci-lint:v1.29
-  commands:
-  - cd logrus
-  - golangci-lint run
-
-- name: logrus test
-  image: golang:1.14.2
-  volumes:
-    - name: deps
-      path: /go/src/mod
-  commands:
-  - cd logrus
-  - go test 
-
-- name: zap golangci-lint
-  image: golangci/golangci-lint:v1.29
-  commands:
-  - cd zap
-  - golangci-lint run
-
-- name: zap test
-  image: golang:1.14.2
-  volumes:
-    - name: deps
-      path: /go/src/mod
-  commands:
-  - cd zap
-  - go test
-
 volumes:
 - name: deps
   temp: {}

go.mod

@@ -1,6 +1,6 @@
 module gitoa.ru/go-4devs/log
 
-go 1.15
+go 1.17
 
 require (
 	github.com/sirupsen/logrus v1.7.0

go.sum

@@ -1,17 +1,23 @@
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8=
 github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60=
+github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -19,13 +25,14 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -42,19 +49,23 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E
 go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=
 go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 h1:iMGN4xG0cnqj3t+zOM8wUB0BiPKHEwSxEZCvzcbZuvk=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e h1:JgcxKXxCjrA2tyDP/aNU9K0Ck5Czfk6C7e2tMw7+bSI=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
@@ -67,6 +78,7 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

handler/logrus/logger.go

@@ -9,82 +9,34 @@ import (
 	"gitoa.ru/go-4devs/log/level"
 )
 
-// Option configure logger.
+// Standard create new standart logrus handler.
-type Option func(*logger)
+func Standard() log.Logger {
-
+	return New(logrus.StandardLogger())
-// WithLevel sets callback level to log level.
-func WithLevel(level level.Level, c func(*logrus.Entry, string)) Option {
-	return func(l *logger) {
-		l.levels[level] = c
-	}
-}
-
-// WithLogrus sets logrus logger.
-func WithLogrus(logrus *logrus.Logger) Option {
-	return func(l *logger) {
-		l.logrus = logrus
-	}
 }
 
 // New create new logrus handler.
-func New(opts ...Option) log.Logger {
+func New(log *logrus.Logger) log.Logger {
-	log := logger{
+	return func(ctx context.Context, e *entry.Entry) (int, error) {
-		logrus: logrus.StandardLogger(),
+		lrgFields := make(logrus.Fields, e.Fields().Len())
-		levels: map[level.Level]func(*logrus.Entry, string){
+		for _, field := range e.Fields() {
-			level.Emergency: panicLog,
+			lrgFields[string(field.Key())] = field.AsInterface()
-			level.Alert:     fatalLog,
+		}
-			level.Critical:  errorLog,
+		write := log.WithContext(ctx).WithFields(lrgFields)
-			level.Error:     errorLog,
+		switch e.Level() {
-			level.Warning:   warnLog,
+		case level.Emergency:
-			level.Notice:    infoLog,
+			write.Panic(e.Message())
-			level.Info:      infoLog,
+		case level.Alert:
-			level.Debug:     debugLog,
+			write.Fatal(e.Message())
-		},
+		case level.Critical, level.Error:
+			write.Error(e.Message())
+		case level.Warning:
+			write.Warn(e.Message())
+		case level.Notice, level.Info:
+			write.Info(e.Message())
+		case level.Debug:
+			write.Debug(e.Message())
+		}
+
+		return 0, nil
 	}
-
-	for _, o := range opts {
-		o(&log)
-	}
-
-	return log.log
-}
-
-type logger struct {
-	levels map[level.Level]func(l *logrus.Entry, msg string)
-	logrus *logrus.Logger
-}
-
-func (l *logger) log(ctx context.Context, e *entry.Entry) (int, error) {
-	lrgFields := make(logrus.Fields, e.Fields().Len())
-	for _, field := range e.Fields() {
-		lrgFields[string(field.Key())] = field.AsInterface()
-	}
-
-	l.levels[e.Level()](l.logrus.WithFields(lrgFields), e.Message())
-
-	return 0, nil
-}
-
-func panicLog(e *logrus.Entry, msg string) {
-	e.Panic(msg)
-}
-
-func fatalLog(e *logrus.Entry, msg string) {
-	e.Fatal(msg)
-}
-
-func errorLog(e *logrus.Entry, msg string) {
-	e.Error(msg)
-}
-
-func warnLog(e *logrus.Entry, msg string) {
-	e.Warn(msg)
-}
-
-func infoLog(e *logrus.Entry, msg string) {
-	e.Info(msg)
-}
-
-func debugLog(e *logrus.Entry, msg string) {
-	e.Debug(msg)
 }

handler/logrus/logger_test.go

@@ -23,7 +23,7 @@ func TestNew(t *testing.T) {
 		DisableTimestamp: true,
 	})
 
-	handler := logrus.New(logrus.WithLogrus(lgrus))
+	handler := logrus.New(lgrus)
 	expect := "level=info msg=\"handle logrus message\"\n"
 
 	if _, err := handler(ctx, entry.New(entry.WithLevel(level.Info), entry.WithMessage("handle logrus message"))); err != nil {

handler/zap/logger.go

@@ -9,87 +9,55 @@ import (
 	"go.uber.org/zap"
 )
 
-// Option configure logger.
+func Nop() log.Logger {
-type Option func(*logger)
+	return New(zap.NewNop())
-
-// WithLevel sets level logged message.
-func WithLevel(level level.Level, f func(z *zap.Logger, msg string, fields ...zap.Field)) Option {
-	return func(l *logger) {
-		l.levels[level] = f
-	}
 }
 
-// WithZap sets zap logger.
+func Example(options ...zap.Option) log.Logger {
-func WithZap(z *zap.Logger) Option {
+	return New(zap.NewExample(options...))
-	return func(l *logger) {
-		l.zap = z
-	}
 }
 
-// New create handler by zap logger.
+func Production(options ...zap.Option) log.Logger {
-func New(opts ...Option) log.Logger {
+	z, err := zap.NewProduction(options...)
-	z, err := zap.NewDevelopment()
 	if err != nil {
 		panic(err)
 	}
 
-	log := logger{
+	return New(z)
-		zap: z,
+}
-		levels: map[level.Level]func(z *zap.Logger, msg string, fields ...zap.Field){
+
-			level.Emergency: fatalLog,
+func Development(options ...zap.Option) log.Logger {
-			level.Alert:     panicLog,
+	z, err := zap.NewDevelopment(options...)
-			level.Critical:  errorLog,
+	if err != nil {
-			level.Error:     errorLog,
+		panic(err)
-			level.Warning:   warnLog,
-			level.Notice:    infoLog,
-			level.Info:      infoLog,
-			level.Debug:     debugLog,
-		},
 	}
 
-	for _, opt := range opts {
+	return New(z)
-		opt(&log)
+}
+
+// New create handler by zap logger.
+func New(z *zap.Logger) log.Logger {
+	return func(ctx context.Context, e *entry.Entry) (int, error) {
+		zf := make([]zap.Field, e.Fields().Len())
+		for i, field := range e.Fields() {
+			zf[i] = zap.Any(string(field.Key()), field.AsInterface())
+		}
+
+		switch e.Level() {
+		case level.Emergency:
+			z.Fatal(e.Message(), zf...)
+		case level.Alert:
+			z.Panic(e.Message(), zf...)
+		case level.Critical, level.Error:
+			z.Error(e.Message(), zf...)
+		case level.Warning:
+			z.Warn(e.Message(), zf...)
+		case level.Notice, level.Info:
+			z.Info(e.Message(), zf...)
+		case level.Debug:
+			z.Debug(e.Message(), zf...)
+		}
+
+		return 0, nil
 	}
-
-	return log.log
-}
-
-type logger struct {
-	zap    *zap.Logger
-	levels map[level.Level]func(z *zap.Logger, msg string, fields ...zap.Field)
-}
-
-func (l *logger) log(ctx context.Context, e *entry.Entry) (int, error) {
-	zf := make([]zap.Field, e.Fields().Len())
-	for i, field := range e.Fields() {
-		zf[i] = zap.Any(string(field.Key()), field.AsInterface())
-	}
-
-	l.levels[e.Level()](l.zap, e.Message(), zf...)
-
-	return 0, nil
-}
-
-func panicLog(z *zap.Logger, msg string, fields ...zap.Field) {
-	z.Panic(msg, fields...)
-}
-
-func fatalLog(z *zap.Logger, msg string, fields ...zap.Field) {
-	z.Fatal(msg, fields...)
-}
-
-func errorLog(z *zap.Logger, msg string, fields ...zap.Field) {
-	z.Error(msg, fields...)
-}
-
-func warnLog(z *zap.Logger, msg string, fields ...zap.Field) {
-	z.Warn(msg, fields...)
-}
-
-func infoLog(z *zap.Logger, msg string, fields ...zap.Field) {
-	z.Info(msg, fields...)
-}
-
-func debugLog(z *zap.Logger, msg string, fields ...zap.Field) {
-	z.Debug(msg, fields...)
 }

handler/zap/logger_test.go

@@ -24,7 +24,7 @@ func TestNew(t *testing.T) {
 		EncodeTime:     zapcore.ISO8601TimeEncoder,
 		EncodeDuration: zapcore.StringDurationEncoder,
 	}), zapcore.AddSync(buf), zapcore.DebugLevel)
-	logger := zlog.New(zlog.WithZap(zap.New(core)))
+	logger := zlog.New(zap.New(core))
 	expect := `{"level":"info","msg":"handle zap message","env":"test"}` + "\n"
 
 	if _, err := logger(ctx, entry.New(

logger.go

@@ -323,6 +323,33 @@ type writer struct {
 	Logger
 }
 
+func (w writer) WithLevel(level level.Level) writer {
+	return writer{
+		level:  level,
+		Logger: w.Logger,
+		ctx:    w.ctx,
+		fields: w.fields,
+	}
+}
+
+func (w writer) WithContext(ctx context.Context) writer {
+	return writer{
+		level:  w.level,
+		Logger: w.Logger,
+		ctx:    ctx,
+		fields: w.fields,
+	}
+}
+
+func (w writer) WithFields(fields ...field.Field) writer {
+	return writer{
+		level:  w.level,
+		Logger: w.Logger,
+		ctx:    w.ctx,
+		fields: fields,
+	}
+}
+
 func (w writer) Write(in []byte) (int, error) {
 	return w.write(w.ctx, w.level, string(in), w.fields...)
 }

logger_example_logrus_test.go

@@ -2,20 +2,27 @@ package log_test
 
 import (
 	"io"
+	"os"
 
+	slogrus "github.com/sirupsen/logrus"
 	"gitoa.ru/go-4devs/log/field"
-	"gitoa.ru/go-4devs/log/handler/zap"
+	"gitoa.ru/go-4devs/log/handler/logrus"
-	uzap "go.uber.org/zap"
 )
 
-func ExampleNew_zapHandler() {
+func ExampleNew_logrusHandler() {
-	log := zap.New(zap.WithZap(uzap.NewExample()))
+	lgrs := slogrus.New()
-	log.Err(ctx, "log zap")
+	lgrs.SetOutput(os.Stdout)
-	log.ErrKV(ctx, "log zap kv", field.Int("int", 42))
+	lgrs.SetFormatter(&slogrus.TextFormatter{
-	log.ErrKVs(ctx, "log zap kv sugar", "err", io.EOF)
+		DisableTimestamp: true,
+	})
+
+	log := logrus.New(lgrs)
+	log.Err(ctx, "log logrus")
+	log.ErrKV(ctx, "log logrus kv", field.Int("int", 42))
+	log.ErrKVs(ctx, "log logrus kv sugar", "err", io.EOF)
 
 	// Output:
-	// {"level":"error","msg":"log zap"}
+	// level=error msg="log logrus"
-	// {"level":"error","msg":"log zap kv","int":42}
+	// level=error msg="log logrus kv" int=42
-	// {"level":"error","msg":"log zap kv sugar","err":"EOF"}
+	// level=error msg="log logrus kv sugar" err=EOF
 }

logger_example_zap_test.go

@@ -2,27 +2,20 @@ package log_test
 
 import (
 	"io"
-	"os"
 
-	slogrus "github.com/sirupsen/logrus"
 	"gitoa.ru/go-4devs/log/field"
-	"gitoa.ru/go-4devs/log/handler/logrus"
+	"gitoa.ru/go-4devs/log/handler/zap"
+	uzap "go.uber.org/zap"
 )
 
-func ExampleNew_logrusHandler() {
+func ExampleNew_zapHandler() {
-	lgrs := slogrus.New()
+	log := zap.New(uzap.NewExample())
-	lgrs.SetOutput(os.Stdout)
+	log.Err(ctx, "log zap")
-	lgrs.SetFormatter(&slogrus.TextFormatter{
+	log.ErrKV(ctx, "log zap kv", field.Int("int", 42))
-		DisableTimestamp: true,
+	log.ErrKVs(ctx, "log zap kv sugar", "err", io.EOF)
-	})
-
-	log := logrus.New(logrus.WithLogrus(lgrs))
-	log.Err(ctx, "log logrus")
-	log.ErrKV(ctx, "log logrus kv", field.Int("int", 42))
-	log.ErrKVs(ctx, "log logrus kv sugar", "err", io.EOF)
 
 	// Output:
-	// level=error msg="log logrus"
+	// {"level":"error","msg":"log zap"}
-	// level=error msg="log logrus kv" int=42
+	// {"level":"error","msg":"log zap kv","int":42}
-	// level=error msg="log logrus kv sugar" err=EOF
+	// {"level":"error","msg":"log zap kv sugar","err":"EOF"}
 }

writter.go

@@ -50,9 +50,7 @@ func WithWriter(writer io.Writer) Option {
 
 // WithStdout sets logged to os.Stdout.
 func WithStdout() Option {
-	return func(l *log) {
+	return WithWriter(os.Stdout)
-		l.w = os.Stdout
-	}
 }
 
 // WithEncode sets format log.
@@ -64,16 +62,12 @@ func WithEncode(e Encode) Option {
 
 // WithStringFormat sets format as simple string.
 func WithStringFormat() Option {
-	return func(l *log) {
+	return WithEncode(stringFormat())
-		l.e = stringFormat()
-	}
 }
 
 // WithJSONFormat sets json output format.
 func WithJSONFormat() Option {
-	return func(l *log) {
+	return WithEncode(jsonFormat)
-		l.e = jsonFormat
-	}
 }
 
 func stringFormat() func(entry *entry.Entry) ([]byte, error) {