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

@@ -10,10 +10,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 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/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=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -25,7 +23,6 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
 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=
@@ -48,7 +45,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
 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/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -62,10 +58,8 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=

handler/logrus/logger.go

@@ -9,82 +9,34 @@ import (
 	"gitoa.ru/go-4devs/log/level"
 )
 
-// Option configure logger.
-type Option func(*logger)
-
-// 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
-	}
+// Standard create new standart logrus handler.
+func Standard() log.Logger {
+	return New(logrus.StandardLogger())
 }
 
 // New create new logrus handler.
-func New(opts ...Option) log.Logger {
-	log := logger{
-		logrus: logrus.StandardLogger(),
-		levels: map[level.Level]func(*logrus.Entry, string){
-			level.Emergency: panicLog,
-			level.Alert:     fatalLog,
-			level.Critical:  errorLog,
-			level.Error:     errorLog,
-			level.Warning:   warnLog,
-			level.Notice:    infoLog,
-			level.Info:      infoLog,
-			level.Debug:     debugLog,
-		},
-	}
-
-	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) {
+func New(log *logrus.Logger) log.Logger {
+	return func(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())
+		write := log.WithContext(ctx).WithFields(lrgFields)
+		switch e.Level() {
+		case level.Emergency:
+			write.Panic(e.Message())
+		case level.Alert:
+			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
-}
-
-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.
-type Option func(*logger)
-
-// 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
-	}
+func Nop() log.Logger {
+	return New(zap.NewNop())
 }
 
-// WithZap sets zap logger.
-func WithZap(z *zap.Logger) Option {
-	return func(l *logger) {
-		l.zap = z
-	}
+func Example(options ...zap.Option) log.Logger {
+	return New(zap.NewExample(options...))
 }
 
-// New create handler by zap logger.
-func New(opts ...Option) log.Logger {
-	z, err := zap.NewDevelopment()
+func Production(options ...zap.Option) log.Logger {
+	z, err := zap.NewProduction(options...)
 	if err != nil {
 		panic(err)
 	}
 
-	log := logger{
-		zap: z,
-		levels: map[level.Level]func(z *zap.Logger, msg string, fields ...zap.Field){
-			level.Emergency: fatalLog,
-			level.Alert:     panicLog,
-			level.Critical:  errorLog,
-			level.Error:     errorLog,
-			level.Warning:   warnLog,
-			level.Notice:    infoLog,
-			level.Info:      infoLog,
-			level.Debug:     debugLog,
-		},
-	}
-
-	for _, opt := range opts {
-		opt(&log)
-	}
-
-	return log.log
+	return New(z)
 }
 
-type logger struct {
-	zap    *zap.Logger
-	levels map[level.Level]func(z *zap.Logger, msg string, fields ...zap.Field)
+func Development(options ...zap.Option) log.Logger {
+	z, err := zap.NewDevelopment(options...)
+	if err != nil {
+		panic(err)
+	}
+
+	return New(z)
 }
 
-func (l *logger) log(ctx context.Context, e *entry.Entry) (int, error) {
+// 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())
 		}
 
-	l.levels[e.Level()](l.zap, e.Message(), zf...)
+		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
-}
-
-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"
-	uzap "go.uber.org/zap"
+	"gitoa.ru/go-4devs/log/handler/logrus"
 )
 
-func ExampleNew_zapHandler() {
-	log := zap.New(zap.WithZap(uzap.NewExample()))
-	log.Err(ctx, "log zap")
-	log.ErrKV(ctx, "log zap kv", field.Int("int", 42))
-	log.ErrKVs(ctx, "log zap kv sugar", "err", io.EOF)
+func ExampleNew_logrusHandler() {
+	lgrs := slogrus.New()
+	lgrs.SetOutput(os.Stdout)
+	lgrs.SetFormatter(&slogrus.TextFormatter{
+		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 zap kv","int":42}
-	// {"level":"error","msg":"log zap kv sugar","err":"EOF"}
+	// level=error msg="log logrus"
+	// level=error msg="log logrus kv" int=42
+	// 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() {
-	lgrs := slogrus.New()
-	lgrs.SetOutput(os.Stdout)
-	lgrs.SetFormatter(&slogrus.TextFormatter{
-		DisableTimestamp: true,
-	})
-
-	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)
+func ExampleNew_zapHandler() {
+	log := zap.New(uzap.NewExample())
+	log.Err(ctx, "log zap")
+	log.ErrKV(ctx, "log zap kv", field.Int("int", 42))
+	log.ErrKVs(ctx, "log zap kv sugar", "err", io.EOF)
 
 	// Output:
-	// level=error msg="log logrus"
-	// level=error msg="log logrus kv" int=42
-	// level=error msg="log logrus kv sugar" err=EOF
+	// {"level":"error","msg":"log zap"}
+	// {"level":"error","msg":"log zap kv","int":42}
+	// {"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) {
-		l.w = os.Stdout
-	}
+	return WithWriter(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) {
-		l.e = stringFormat()
-	}
+	return WithEncode(stringFormat())
 }
 
 // WithJSONFormat sets json output format.
 func WithJSONFormat() Option {
-	return func(l *log) {
-		l.e = jsonFormat
-	}
+	return WithEncode(jsonFormat)
 }
 
 func stringFormat() func(entry *entry.Entry) ([]byte, error) {