mod tidy

.drone.yml

@@ -3,7 +3,7 @@ name: default
 
 steps:
 - name: test 
-  image: golang:1.18.1
+  image: golang:1.17.1
   volumes:
   - name: deps
     path: /go/src/mod
@@ -11,7 +11,7 @@ steps:
   - go test 
 
 - name: golangci-lint
-  image: golangci/golangci-lint:v1.49
+  image: golangci/golangci-lint:v1.42
   commands:
   - golangci-lint run
 

.golangci.yml

@@ -9,45 +9,21 @@ linters-settings:
       min-occurrences: 2
     gocyclo:
       min-complexity: 15
+    golint:
+      min-confidence: 0
     govet:
       check-shadowing: true
     lll:
       line-length: 140
-    fieldalignment:
+    maligned:
       suggest-new: true
     misspell:
       locale: US  
     exhaustive:
       default-signifies-exhaustive: true
-    varnamelen:
-      min-name-length: 2
-      ignore-names:
-        - err
-        - "n"
-        - i
-    tagliatelle:
-      case:
-        use-field-name: true
-        rules:
-          json: snake
-          yaml: camel
-          xml: camel
-          bson: camel
-          avro: snake
 
 linters:
     enable-all: true
-    disable:
-      - exhaustivestruct
-      - maligned
-      - deadcode
-      - interfacer
-      - golint
-      - varcheck
-      - nosnakecase
-      - scopelint
-      - ifshort
-      - structcheck
 
 issues:
   # Excluding configuration per-path, per-linter, per-text and per-source
@@ -55,5 +31,3 @@ issues:
     - path: _test\.go
       linters:
         - gomnd
-        - ireturn
-        - exhaustruct

LICENSE

@@ -1,4 +1,4 @@
-MIT License Copyright (c) 2020-2022 4devs
+MIT License Copyright (c) 2020 go-4devs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

bench_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"testing"
 	"time"
 
@@ -118,7 +118,7 @@ func fakeSugarFields() []interface{} {
 }
 
 func NewLogger() log.Logger {
-	return log.New(log.WithWriter(io.Discard))
+	return log.New(log.WithWriter(ioutil.Discard))
 }
 
 func BenchmarkDisabledWithoutFields(b *testing.B) {

entry/caller.go

@@ -7,14 +7,14 @@ import (
 )
 
 func Caller(depth int, full bool) string {
-	const offset = 3
+	const offset = 4
-	_, file, line, has := runtime.Caller(depth + offset)
+	_, file, line, ok := runtime.Caller(depth + offset)
 
-	if !has {
+	if !ok {
 		file, line = "???", 0
 	}
 
-	if !full && has {
+	if !full && ok {
 		file = filepath.Base(file)
 	}
 

entry/entry.go

@@ -1,7 +1,6 @@
 package entry
 
 import (
-	"fmt"
 	"strings"
 
 	"gitoa.ru/go-4devs/log/field"
@@ -14,9 +13,9 @@ const (
 
 type Option func(*Entry)
 
-func WithCapacity(c int) Option {
+func WithCapacity(cap int) Option {
 	return func(e *Entry) {
-		e.fields = make(field.Fields, 0, c+1)
+		e.fields = make(field.Fields, 0, cap+1)
 	}
 }
 
@@ -28,14 +27,7 @@ func WithFields(fields ...field.Field) Option {
 
 func WithMessage(msg string) Option {
 	return func(e *Entry) {
-		e.format = msg
+		e.msg = msg
-	}
-}
-
-func WithMessagef(format string, args ...interface{}) Option {
-	return func(e *Entry) {
-		e.format = format
-		e.args = args
 	}
 }
 
@@ -46,32 +38,27 @@ func WithLevel(lvl level.Level) Option {
 }
 
 func New(opts ...Option) *Entry {
-	entry := &Entry{
+	e := &Entry{
 		fields: make(field.Fields, 0, defaultCap+1),
 		level:  level.Debug,
-		format: "",
-		args:   make([]interface{}, 0, defaultCap+1),
 	}
 
 	for _, opt := range opts {
-		opt(entry)
+		opt(e)
 	}
 
-	return entry
+	return e
 }
 
 // Entry slice field.
 type Entry struct {
-	format string
+	msg    string
-	args   []interface{}
 	level  level.Level
 	fields field.Fields
 }
 
 func (e *Entry) Reset() {
 	e.fields = e.fields[:0]
-	e.args = e.args[:0]
-	e.format = ""
 }
 
 func (e *Entry) Fields() field.Fields {
@@ -85,7 +72,7 @@ func (e *Entry) String() string {
 	}
 
 	str := make([]string, len(e.fields)+1)
-	str[0] = e.Message()
+	str[0] = e.msg
 
 	for i, field := range e.fields {
 		str[i+1] = field.String()
@@ -95,14 +82,7 @@ func (e *Entry) String() string {
 }
 
 func (e *Entry) Message() string {
-	switch {
+	return e.msg
-	case len(e.args) > 0 && e.format != "":
-		return fmt.Sprintf(e.format, e.args...)
-	case len(e.args) > 0:
-		return fmt.Sprint(e.args...)
-	default:
-		return e.format
-	}
 }
 
 func (e *Entry) Level() level.Level {
@@ -128,18 +108,7 @@ func (e *Entry) SetMessage(msg string) *Entry {
 		return New().SetMessage(msg)
 	}
 
-	e.format = msg
+	e.msg = msg
-
-	return e
-}
-
-func (e *Entry) SetMessagef(format string, args ...interface{}) *Entry {
-	if e == nil {
-		return New().SetMessagef(format, args...)
-	}
-
-	e.format = format
-	e.args = append(e.args[:0], args...)
 
 	return e
 }

entry/pool.go

@@ -9,7 +9,6 @@ var pool = sync.Pool{
 	},
 }
 
-//nolint:forcetypeassert
 func Get() *Entry {
 	e := pool.Get().(*Entry)
 	e.Reset()

field/encoder.go

@@ -2,7 +2,6 @@ package field
 
 import "time"
 
-//nolint:interfacebloat
 type Encoder interface {
 	// Built-in types.
 	AddArray(key string, value Value)

field/field.go

@@ -255,13 +255,13 @@ type Field struct {
 	value Value
 }
 
-//nolint:gocyclo,cyclop
+//nolint: gocyclo
 func (f Field) AddTo(enc Encoder) {
 	key := string(f.key)
 
 	switch {
 	case f.value.IsArray():
-		enc.AddArray(key, f.value)
+		enc.AddAny(key, f.value)
 	case f.value.IsNil():
 		enc.AddNil(key)
 	case f.value.IsBool():

field/fields.go

@@ -19,11 +19,11 @@ func (f Fields) Len() int {
 }
 
 func (f Fields) AsMap() MapField {
-	fields := make(MapField, len(f))
+	m := make(MapField, len(f))
 
 	for _, field := range f {
-		fields[field.Key()] = field.Value()
+		m[field.Key()] = field.Value()
 	}
 
-	return fields
+	return m
 }

field/fields_test.go

@@ -1,18 +0,0 @@
-package field_test
-
-import (
-	"testing"
-
-	"gitoa.ru/go-4devs/log/field"
-)
-
-func TestFields_Append(t *testing.T) {
-	t.Parallel()
-
-	fields := field.Fields{field.Any("any", "value")}
-	fields = fields.Append(field.String("string", "value"))
-
-	if len(fields) != 2 {
-		t.Fatalf("require 2 field got %v", len(fields))
-	}
-}

field/key.go

@@ -6,115 +6,115 @@ import (
 
 type Key string
 
-//nolint:funlen,cyclop,gocyclo
+//nolint: gocyclo, funlen
 func (k Key) Any(value interface{}) Field {
-	switch val := value.(type) {
+	switch v := value.(type) {
 	case string:
-		return k.String(val)
+		return k.String(v)
 	case *string:
-		return k.Stringp(val)
+		return k.Stringp(v)
 	case []string:
-		return k.Strings(val...)
+		return k.Strings(v...)
 	case bool:
-		return k.Bool(val)
+		return k.Bool(v)
 	case *bool:
-		return k.Boolp(val)
+		return k.Boolp(v)
 	case []bool:
-		return k.Bools(val...)
+		return k.Bools(v...)
 	case int8:
-		return k.Int8(val)
+		return k.Int8(v)
 	case []int8:
-		return k.Int8s(val...)
+		return k.Int8s(v...)
 	case *int8:
-		return k.Int8p(val)
+		return k.Int8p(v)
 	case int16:
-		return k.Int16(val)
+		return k.Int16(v)
 	case []int16:
-		return k.Int16s(val...)
+		return k.Int16s(v...)
 	case *int16:
-		return k.Int16p(val)
+		return k.Int16p(v)
 	case int32:
-		return k.Int32(val)
+		return k.Int32(v)
 	case []int32:
-		return k.Int32s(val...)
+		return k.Int32s(v...)
 	case *int32:
-		return k.Int32p(val)
+		return k.Int32p(v)
 	case int64:
-		return k.Int64(val)
+		return k.Int64(v)
 	case []int64:
-		return k.Int64s(val...)
+		return k.Int64s(v...)
 	case *int64:
-		return k.Int64p(val)
+		return k.Int64p(v)
 	case uint:
-		return k.Uint(val)
+		return k.Uint(v)
 	case []uint:
-		return k.Uints(val...)
+		return k.Uints(v...)
 	case *uint:
-		return k.Uintp(val)
+		return k.Uintp(v)
 	case uint8:
-		return k.Uint8(val)
+		return k.Uint8(v)
 	case *uint8:
-		return k.Uint8p(val)
+		return k.Uint8p(v)
 	case uint16:
-		return k.Uint16(val)
+		return k.Uint16(v)
 	case []uint16:
-		return k.Uint16s(val...)
+		return k.Uint16s(v...)
 	case *uint16:
-		return k.Uint16p(val)
+		return k.Uint16p(v)
 	case uint32:
-		return k.Uint32(val)
+		return k.Uint32(v)
 	case []uint32:
-		return k.Uint32s(val...)
+		return k.Uint32s(v...)
 	case *uint32:
-		return k.Uint32p(val)
+		return k.Uint32p(v)
 	case uint64:
-		return k.Uint64(val)
+		return k.Uint64(v)
 	case []uint64:
-		return k.Uint64s(val...)
+		return k.Uint64s(v...)
 	case *uint64:
-		return k.Uint64p(val)
+		return k.Uint64p(v)
 	case float32:
-		return k.Float32(val)
+		return k.Float32(v)
 	case []float32:
-		return k.Float32s(val...)
+		return k.Float32s(v...)
 	case *float32:
-		return k.Float32p(val)
+		return k.Float32p(v)
 	case float64:
-		return k.Float64(val)
+		return k.Float64(v)
 	case []float64:
-		return k.Float64s(val...)
+		return k.Float64s(v...)
 	case *float64:
-		return k.Float64p(val)
+		return k.Float64p(v)
 	case complex64:
-		return k.Complex64(val)
+		return k.Complex64(v)
 	case []complex64:
-		return k.Complex64s(val...)
+		return k.Complex64s(v...)
 	case *complex64:
-		return k.Complex64p(val)
+		return k.Complex64p(v)
 	case uintptr:
-		return k.Uintptr(val)
+		return k.Uintptr(v)
 	case []uintptr:
-		return k.Uintptrs(val...)
+		return k.Uintptrs(v...)
 	case *uintptr:
-		return k.Uintptrp(val)
+		return k.Uintptrp(v)
 	case []byte:
-		return k.Bytes(val)
+		return k.Bytes(v)
 	case time.Duration:
-		return k.Dureation(val)
+		return k.Dureation(v)
 	case []time.Duration:
-		return k.Dureations(val)
+		return k.Dureations(v)
 	case *time.Duration:
-		return k.Dureationp(val)
+		return k.Dureationp(v)
 	case time.Time:
-		return k.Time(val)
+		return k.Time(v)
 	case []time.Time:
-		return k.Times(val...)
+		return k.Times(v...)
 	case *time.Time:
-		return k.Timep(val)
+		return k.Timep(v)
 	case error:
-		return k.Error(val)
+		return k.Error(v)
 	case []error:
-		return k.Errors(val...)
+		return k.Errors(v...)
 	}
 
 	return Field{
@@ -122,8 +122,6 @@ func (k Key) Any(value interface{}) Field {
 		value: Value{
 			value: value,
 			vtype: TypeAny,
-			numeric:  0,
-			stringly: "",
 		},
 	}
 }

field/value.go

@@ -16,15 +16,10 @@ type Value struct {
 }
 
 func (v Value) MarshalJSON() ([]byte, error) {
-	b, err := json.Marshal(v.AsInterface())
+	return json.Marshal(v.AsInterface())
-	if err != nil {
-		return nil, fmt.Errorf("marshal err: %w", err)
 }
 
-	return b, nil
+//nolint: gocyclo
-}
-
-//nolint:gocyclo,gomnd,cyclop
 func (v Value) String() string {
 	switch {
 	case v.vtype.IsArray(), v.vtype.IsAny():
@@ -62,7 +57,7 @@ func (v Value) String() string {
 	return fmt.Sprintf("%+v", v.AsInterface())
 }
 
-//nolint:gocyclo,cyclop
+//nolint: gocyclo
 func (v Value) AsInterface() interface{} {
 	switch {
 	case v.vtype.IsArray():
@@ -265,62 +260,41 @@ func (v Value) asFloat64() float64 {
 }
 
 func (v Value) asComplex64() complex64 {
-	cmplex, _ := v.value.(complex64)
+	return v.value.(complex64)
-
-	return cmplex
 }
 
 func (v Value) asComplex128() complex128 {
-	cmplex, _ := v.value.(complex128)
+	return v.value.(complex128)
-
-	return cmplex
 }
 
 func (v Value) asUintptr() uintptr {
-	val, _ := v.value.(uintptr)
+	return v.value.(uintptr)
-
-	return val
 }
 
 func (v Value) asBinary() []byte {
-	bytes, _ := v.value.([]byte)
+	return v.value.([]byte)
-
-	return bytes
 }
 
 func (v Value) asDuration() time.Duration {
-	duration, _ := v.value.(time.Duration)
+	return v.value.(time.Duration)
-
-	return duration
 }
 
 func (v Value) asTime() time.Time {
-	value, _ := v.value.(time.Time)
+	return v.value.(time.Time)
-
-	return value
 }
 
 func (v Value) asError() error {
-	err, _ := v.value.(error)
+	return v.value.(error)
-
-	return err
 }
 
 func nilValue(t Type) Value {
-	return Value{
+	return Value{vtype: t | TypeNil}
-		vtype:    t | TypeNil,
-		value:    nil,
-		numeric:  0,
-		stringly: "",
-	}
 }
 
 func stringValue(v string) Value {
 	return Value{
 		stringly: v,
 		vtype:    TypeString,
-		numeric:  0,
-		value:    nil,
 	}
 }
 
@@ -328,8 +302,6 @@ func stringsValue(v []string) Value {
 	return Value{
 		value: v,
 		vtype: TypeString | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -346,16 +318,11 @@ func boolValue(b bool) Value {
 		return Value{
 			numeric: 1,
 			vtype:   TypeBool,
-			value:    nil,
-			stringly: "",
 		}
 	}
 
 	return Value{
 		vtype: TypeBool,
-		value:    nil,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -363,8 +330,6 @@ func boolsValue(b []bool) Value {
 	return Value{
 		value: b,
 		vtype: TypeBool | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -380,8 +345,6 @@ func intValue(i int) Value {
 	return Value{
 		vtype:   TypeInt,
 		numeric: uint64(i),
-		value:    nil,
-		stringly: "",
 	}
 }
 
@@ -389,8 +352,6 @@ func intsValue(i []int) Value {
 	return Value{
 		value: i,
 		vtype: TypeInt | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -406,8 +367,6 @@ func int8Value(i int8) Value {
 	return Value{
 		vtype:   TypeInt8,
 		numeric: uint64(i),
-		value:    nil,
-		stringly: "",
 	}
 }
 
@@ -415,8 +374,6 @@ func int8sValue(i []int8) Value {
 	return Value{
 		value: i,
 		vtype: TypeInt8 | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -432,8 +389,6 @@ func int16Value(i int16) Value {
 	return Value{
 		vtype:   TypeInt16,
 		numeric: uint64(i),
-		value:    0,
-		stringly: "",
 	}
 }
 
@@ -441,8 +396,6 @@ func int16sValue(i []int16) Value {
 	return Value{
 		value: i,
 		vtype: TypeInt16 | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -458,8 +411,6 @@ func int32Value(i int32) Value {
 	return Value{
 		vtype:   TypeInt32,
 		numeric: uint64(i),
-		value:    nil,
-		stringly: "",
 	}
 }
 
@@ -467,8 +418,6 @@ func int32sValue(i []int32) Value {
 	return Value{
 		value: i,
 		vtype: TypeInt32 | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -484,8 +433,6 @@ func int64Value(i int64) Value {
 	return Value{
 		vtype:   TypeInt64,
 		numeric: uint64(i),
-		value:    nil,
-		stringly: "",
 	}
 }
 
@@ -493,8 +440,6 @@ func int64sValue(i []int64) Value {
 	return Value{
 		value: i,
 		vtype: TypeInt64 | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -510,8 +455,6 @@ func uintValue(i uint) Value {
 	return Value{
 		vtype:   TypeUint,
 		numeric: uint64(i),
-		value:    nil,
-		stringly: "",
 	}
 }
 
@@ -519,8 +462,6 @@ func uintsValue(i []uint) Value {
 	return Value{
 		value: i,
 		vtype: TypeUint | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -536,8 +477,6 @@ func uint8Value(i uint8) Value {
 	return Value{
 		vtype:   TypeUint8,
 		numeric: uint64(i),
-		value:    nil,
-		stringly: "",
 	}
 }
 
@@ -545,8 +484,6 @@ func uint8sValue(i []uint8) Value {
 	return Value{
 		value: i,
 		vtype: TypeUint8 | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -562,8 +499,6 @@ func uint16Value(i uint16) Value {
 	return Value{
 		vtype:   TypeUint16,
 		numeric: uint64(i),
-		value:    nil,
-		stringly: "",
 	}
 }
 
@@ -571,8 +506,6 @@ func uint16sValue(i []uint16) Value {
 	return Value{
 		value: i,
 		vtype: TypeUint16 | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -588,8 +521,6 @@ func uint32Value(i uint32) Value {
 	return Value{
 		vtype:   TypeUint32,
 		numeric: uint64(i),
-		value:    nil,
-		stringly: "",
 	}
 }
 
@@ -597,8 +528,6 @@ func uint32sValue(i []uint32) Value {
 	return Value{
 		value: i,
 		vtype: TypeUint32 | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -614,8 +543,6 @@ func uint64Value(i uint64) Value {
 	return Value{
 		vtype:   TypeUint64,
 		numeric: i,
-		value:    nil,
-		stringly: "",
 	}
 }
 
@@ -623,8 +550,6 @@ func uint64sValue(i []uint64) Value {
 	return Value{
 		value: i,
 		vtype: TypeUint64 | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -640,8 +565,6 @@ func float32Value(i float32) Value {
 	return Value{
 		vtype:   TypeFloat32,
 		numeric: uint64(math.Float32bits(i)),
-		value:    nil,
-		stringly: "",
 	}
 }
 
@@ -649,8 +572,6 @@ func float32sValue(i []float32) Value {
 	return Value{
 		value: i,
 		vtype: TypeFloat32 | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -666,8 +587,6 @@ func float64Value(i float64) Value {
 	return Value{
 		vtype:   TypeFloat64,
 		numeric: math.Float64bits(i),
-		value:    nil,
-		stringly: "",
 	}
 }
 
@@ -675,8 +594,6 @@ func float64sValue(i []float64) Value {
 	return Value{
 		value: i,
 		vtype: TypeFloat64 | TypeArray,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -692,8 +609,6 @@ func complex64Value(in complex64) Value {
 	return Value{
 		vtype: TypeComplex64,
 		value: in,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -701,8 +616,6 @@ func complex64sValue(in []complex64) Value {
 	return Value{
 		vtype: TypeComplex64 | TypeArray,
 		value: in,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -718,8 +631,6 @@ func complex128Value(in complex128) Value {
 	return Value{
 		vtype: TypeComplex64,
 		value: in,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -727,8 +638,6 @@ func complex128sValue(in []complex128) Value {
 	return Value{
 		vtype: TypeComplex128 | TypeArray,
 		value: in,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -743,8 +652,6 @@ func complex128pValue(in *complex128) Value {
 func uintptrValue(in uintptr) Value {
 	return Value{
 		vtype: TypeUintptr,
-		numeric:  0,
-		stringly: "",
 		value: in,
 	}
 }
@@ -753,8 +660,6 @@ func uintptrsValue(in []uintptr) Value {
 	return Value{
 		vtype: TypeUintptr | TypeArray,
 		value: in,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -770,8 +675,6 @@ func bytesValue(in []byte) Value {
 	return Value{
 		vtype: TypeBinary,
 		value: in,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -779,8 +682,6 @@ func durationValue(in time.Duration) Value {
 	return Value{
 		vtype: TypeDuration,
 		value: in,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -788,8 +689,6 @@ func durationsValue(in []time.Duration) Value {
 	return Value{
 		vtype: TypeDuration | TypeArray,
 		value: in,
-		numeric:  0,
-		stringly: "",
 	}
 }
 
@@ -818,7 +717,6 @@ func formatTimeValue(format string, in time.Time) Value {
 		vtype:    TypeTime,
 		value:    in,
 		stringly: format,
-		numeric:  0,
 	}
 }
 
@@ -827,7 +725,6 @@ func formatTimesValue(format string, in []time.Time) Value {
 		vtype:    TypeTime | TypeArray,
 		value:    in,
 		stringly: format,
-		numeric:  0,
 	}
 }
 
@@ -844,8 +741,6 @@ func errorValue(in error) Value {
 		return Value{
 			vtype: TypeError,
 			value: in,
-			numeric:  0,
-			stringly: "",
 		}
 	}
 
@@ -856,7 +751,5 @@ func errorsValue(in []error) Value {
 	return Value{
 		vtype: TypeError | TypeArray,
 		value: in,
-		numeric:  0,
-		stringly: "",
 	}
 }

go.mod

@@ -3,17 +3,8 @@ module gitoa.ru/go-4devs/log
 go 1.17
 
 require (
-	github.com/sirupsen/logrus v1.8.1
+	github.com/sirupsen/logrus v1.7.0
-	go.opentelemetry.io/otel v1.9.0
+	go.opentelemetry.io/otel v0.13.0
-	go.opentelemetry.io/otel/sdk v1.9.0
+	go.opentelemetry.io/otel/sdk v0.13.0
-	go.opentelemetry.io/otel/trace v1.9.0
+	go.uber.org/zap v1.16.0
-	go.uber.org/zap v1.21.0
-)
-
-require (
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
 )

go.sum

@@ -1,15 +1,15 @@
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60=
+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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 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/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -17,61 +17,54 @@ 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/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+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/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.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+go.opentelemetry.io/otel v0.13.0 h1:2isEnyzjjJZq6r2EKMsFj4TxiQiexsM04AVhwbR/oBA=
-go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw=
+go.opentelemetry.io/otel v0.13.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY=
-go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo=
+go.opentelemetry.io/otel/sdk v0.13.0 h1:4VCfpKamZ8GtnepXxMRurSpHpMKkcxhtO33z1S4rGDQ=
-go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo=
+go.opentelemetry.io/otel/sdk v0.13.0/go.mod h1:dKvLH8Uu8LcEPlSAUsfW7kMGaJBhk/1NYvpPZ6wIMbU=
-go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4=
+go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
-go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc=
+go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo=
+go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
-go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
+go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
-go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=
-go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
+go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
-go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+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.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+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/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/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/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+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-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

handler/logrus/logger.go

@@ -16,27 +16,25 @@ func Standard() log.Logger {
 
 // New create new logrus handler.
 func New(log *logrus.Logger) log.Logger {
-	return func(ctx context.Context, data *entry.Entry) (int, error) {
+	return func(ctx context.Context, e *entry.Entry) (int, error) {
-		lrgFields := make(logrus.Fields, data.Fields().Len())
+		lrgFields := make(logrus.Fields, e.Fields().Len())
-		for _, field := range data.Fields() {
+		for _, field := range e.Fields() {
 			lrgFields[string(field.Key())] = field.AsInterface()
 		}
-
+		write := log.WithContext(ctx).WithFields(lrgFields)
-		entry := log.WithContext(ctx).WithFields(lrgFields)
+		switch e.Level() {
-
-		switch data.Level() {
 		case level.Emergency:
-			entry.Panic(data.Message())
+			write.Panic(e.Message())
 		case level.Alert:
-			entry.Fatal(data.Message())
+			write.Fatal(e.Message())
 		case level.Critical, level.Error:
-			entry.Error(data.Message())
+			write.Error(e.Message())
 		case level.Warning:
-			entry.Warn(data.Message())
+			write.Warn(e.Message())
 		case level.Notice, level.Info:
-			entry.Info(data.Message())
+			write.Info(e.Message())
 		case level.Debug:
-			entry.Debug(data.Message())
+			write.Debug(e.Message())
 		}
 
 		return 0, nil

handler/logrus/logger_test.go

@@ -13,8 +13,6 @@ import (
 )
 
 func TestNew(t *testing.T) {
-	t.Parallel()
-
 	ctx := context.Background()
 	buf := &bytes.Buffer{}
 

handler/otel/helpers.go

@@ -5,8 +5,8 @@ import (
 
 	"gitoa.ru/go-4devs/log/entry"
 	"gitoa.ru/go-4devs/log/level"
-	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/api/trace"
-	"go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/label"
 )
 
 const (
@@ -38,19 +38,19 @@ func levels(lvl level.Level) Level {
 	return 0
 }
 
-func addEvent(ctx context.Context, data *entry.Entry) {
+func addEvent(ctx context.Context, e *entry.Entry) {
 	span := trace.SpanFromContext(ctx)
-	attrs := make([]attribute.KeyValue, 0, data.Fields().Len()+levelFields)
+	attrs := make([]label.KeyValue, 0, e.Fields().Len()+levelFields)
 
-	lvl := levels(data.Level())
+	lvl := levels(e.Level())
 	attrs = append(attrs,
-		attribute.String(fieldSeverityText, lvl.String()),
+		label.String(fieldSeverityText, lvl.String()),
-		attribute.Int(fieldSeverityNumber, int(lvl)),
+		label.Int(fieldSeverityNumber, int(lvl)),
 	)
 
-	for _, field := range data.Fields() {
+	for _, field := range e.Fields() {
-		attrs = append(attrs, attribute.String(string(field.Key()), field.Value().String()))
+		attrs = append(attrs, label.String(string(field.Key()), field.Value().String()))
 	}
 
-	span.AddEvent(data.Message(), trace.WithAttributes(attrs...))
+	span.AddEvent(ctx, e.Message(), attrs...)
 }

handler/zap/logger.go

@@ -36,26 +36,26 @@ func Development(options ...zap.Option) log.Logger {
 }
 
 // New create handler by zap logger.
-func New(logger *zap.Logger) log.Logger {
+func New(z *zap.Logger) log.Logger {
-	return func(ctx context.Context, data *entry.Entry) (int, error) {
+	return func(ctx context.Context, e *entry.Entry) (int, error) {
-		zf := make([]zap.Field, data.Fields().Len())
+		zf := make([]zap.Field, e.Fields().Len())
-		for i, field := range data.Fields() {
+		for i, field := range e.Fields() {
 			zf[i] = zap.Any(string(field.Key()), field.AsInterface())
 		}
 
-		switch data.Level() {
+		switch e.Level() {
 		case level.Emergency:
-			logger.Fatal(data.Message(), zf...)
+			z.Fatal(e.Message(), zf...)
 		case level.Alert:
-			logger.Panic(data.Message(), zf...)
+			z.Panic(e.Message(), zf...)
 		case level.Critical, level.Error:
-			logger.Error(data.Message(), zf...)
+			z.Error(e.Message(), zf...)
 		case level.Warning:
-			logger.Warn(data.Message(), zf...)
+			z.Warn(e.Message(), zf...)
 		case level.Notice, level.Info:
-			logger.Info(data.Message(), zf...)
+			z.Info(e.Message(), zf...)
 		case level.Debug:
-			logger.Debug(data.Message(), zf...)
+			z.Debug(e.Message(), zf...)
 		}
 
 		return 0, nil

handler/zap/logger_test.go

@@ -14,8 +14,6 @@ import (
 )
 
 func TestNew(t *testing.T) {
-	t.Parallel()
-
 	ctx := context.Background()
 	buf := &bytes.Buffer{}
 	core := zapcore.NewCore(zapcore.NewJSONEncoder(zapcore.EncoderConfig{

level/level.go

@@ -2,7 +2,6 @@ package level
 
 import (
 	"encoding/json"
-	"fmt"
 	"strings"
 )
 
@@ -29,12 +28,7 @@ const (
 )
 
 func (l Level) MarshalJSON() ([]byte, error) {
-	b, err := json.Marshal(l.String())
+	return json.Marshal(l.String())
-	if err != nil {
-		return nil, fmt.Errorf("marshal err: %w", err)
-	}
-
-	return b, nil
 }
 
 func (l Level) Is(level Level) bool {
@@ -48,7 +42,7 @@ func (l Level) Enabled(level Level) bool {
 func (l *Level) UnmarshalJSON(in []byte) error {
 	var v string
 	if err := json.Unmarshal(in, &v); err != nil {
-		return fmt.Errorf("unmarshal err: %w", err)
+		return err
 	}
 
 	lvl := Parse(v)

logger.go

@@ -28,46 +28,56 @@ func writeOutput(_ int, err error) {
 // Logger logged message.
 type Logger func(ctx context.Context, entry *entry.Entry) (int, error)
 
+func (l Logger) log(ctx context.Context, level level.Level, args ...interface{}) {
+	writeOutput(l.write(ctx, level, fmt.Sprint(args...)))
+}
+
 func (l Logger) Write(in []byte) (int, error) {
 	return l.write(context.Background(), level.Info, string(in))
 }
 
 func (l Logger) write(ctx context.Context, level level.Level, msg string, fields ...field.Field) (int, error) {
-	data := entry.Get()
+	e := entry.Get()
 
 	defer func() {
-		entry.Put(data)
+		entry.Put(e)
 	}()
 
-	return l(ctx, data.SetLevel(level).SetMessage(msg).Add(fields...))
+	return l(ctx, e.SetLevel(level).SetMessage(msg).Add(fields...))
 }
 
-func (l Logger) writef(ctx context.Context, level level.Level, format string, args ...interface{}) (int, error) {
+func (l Logger) logKVs(ctx context.Context, level level.Level, msg string, args ...interface{}) {
-	data := entry.Get()
+	writeOutput(l.write(ctx, level, msg, l.kv(ctx, args...)...))
+}
 
-	defer func() {
+func (l Logger) logKV(ctx context.Context, level level.Level, msg string, fields ...field.Field) {
-		entry.Put(data)
+	writeOutput(l.write(ctx, level, msg, fields...))
-	}()
+}
 
-	return l(ctx, data.SetLevel(level).SetMessagef(format, args...))
+func (l Logger) logf(ctx context.Context, level level.Level, format string, args ...interface{}) {
+	writeOutput(l.write(ctx, level, fmt.Sprintf(format, args...)))
+}
+
+func (l Logger) logln(ctx context.Context, level level.Level, args ...interface{}) {
+	writeOutput(l.write(ctx, level, fmt.Sprintln(args...)))
 }
 
 func (l Logger) kv(ctx context.Context, args ...interface{}) field.Fields {
-	kvEntry := entry.Get()
+	e := entry.Get()
 
 	defer func() {
-		entry.Put(kvEntry)
+		entry.Put(e)
 	}()
 
 	for i := 0; i < len(args); i++ {
 		if f, ok := args[i].(field.Field); ok {
-			kvEntry = kvEntry.Add(f)
+			e = e.Add(f)
 
 			continue
 		}
 
 		if i == len(args)-1 {
-			writeOutput(l.write(ctx, level.Critical, fmt.Sprint("Ignored key without a value.", args[i]), kvEntry.Fields()...))
+			l.logKV(ctx, level.Critical, fmt.Sprint("Ignored key without a value.", args[i]), e.Fields()...)
 
 			break
 		}
@@ -76,15 +86,15 @@ func (l Logger) kv(ctx context.Context, args ...interface{}) field.Fields {
 
 		key, val := args[i-1], args[i]
 		if keyStr, ok := key.(string); ok {
-			kvEntry = kvEntry.AddAny(keyStr, val)
+			e = e.AddAny(keyStr, val)
 
 			continue
 		}
 
-		writeOutput(l.write(ctx, level.Critical, fmt.Sprint("Ignored key-value pairs with non-string keys.", key, val), kvEntry.Fields()...))
+		l.logKV(ctx, level.Critical, fmt.Sprint("Ignored key-value pairs with non-string keys.", key, val), e.Fields()...)
 	}
 
-	return kvEntry.Fields()
+	return e.Fields()
 }
 
 // With adds middlewares to logger.
@@ -94,207 +104,207 @@ func (l Logger) With(mw ...Middleware) Logger {
 
 // Emerg log by emergency level.
 func (l Logger) Emerg(ctx context.Context, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Emergency, "", args...))
+	l.log(ctx, level.Emergency, args...)
 }
 
 // Alert log by alert level.
 func (l Logger) Alert(ctx context.Context, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Alert, "", args...))
+	l.log(ctx, level.Alert, args...)
 }
 
 // Crit log by critical level.
 func (l Logger) Crit(ctx context.Context, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Critical, "", args...))
+	l.log(ctx, level.Critical, args...)
 }
 
 // Err log by error level.
 func (l Logger) Err(ctx context.Context, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Error, "", args...))
+	l.log(ctx, level.Error, args...)
 }
 
 // Warn log by warning level.
 func (l Logger) Warn(ctx context.Context, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Warning, "", args...))
+	l.log(ctx, level.Warning, args...)
 }
 
 // Notice log by notice level.
 func (l Logger) Notice(ctx context.Context, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Notice, "", args...))
+	l.log(ctx, level.Notice, args...)
 }
 
 // Info log by info level.
 func (l Logger) Info(ctx context.Context, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Info, "", args...))
+	l.log(ctx, level.Info, args...)
 }
 
 // Debug log by debug level.
 func (l Logger) Debug(ctx context.Context, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Debug, "", args...))
+	l.log(ctx, level.Debug, args...)
 }
 
 // Print log by info level and arguments.
 func (l Logger) Print(args ...interface{}) {
-	writeOutput(l.writef(context.Background(), level.Info, "", args...))
+	l.log(context.Background(), level.Info, args...)
 }
 
 // Fatal log by alert level and arguments.
 func (l Logger) Fatal(args ...interface{}) {
-	writeOutput(l.writef(context.Background(), level.Alert, "", args...))
+	l.log(context.Background(), level.Alert, args...)
 }
 
 // Panic log by emergency level and arguments.
 func (l Logger) Panic(args ...interface{}) {
-	writeOutput(l.writef(context.Background(), level.Emergency, "", args...))
+	l.log(context.Background(), level.Emergency, args...)
 }
 
 // Println log by info level and arguments.
 func (l Logger) Println(args ...interface{}) {
-	writeOutput(l.write(context.Background(), level.Info, fmt.Sprintln(args...)))
+	l.logln(context.Background(), level.Info, args...)
 }
 
 // Fatalln log by alert level and arguments.
 func (l Logger) Fatalln(args ...interface{}) {
-	writeOutput(l.write(context.Background(), level.Alert, fmt.Sprintln(args...)))
+	l.logln(context.Background(), level.Alert, args...)
 }
 
 // Panicln log by emergency level and arguments.
 func (l Logger) Panicln(args ...interface{}) {
-	writeOutput(l.write(context.Background(), level.Emergency, fmt.Sprintln(args...)))
+	l.logln(context.Background(), level.Emergency, args...)
 }
 
 // EmergKVs sugared log by emergency level and key-values.
 func (l Logger) EmergKVs(ctx context.Context, msg string, args ...interface{}) {
-	writeOutput(l.write(ctx, level.Emergency, msg, l.kv(ctx, args...)...))
+	l.logKVs(ctx, level.Emergency, msg, args...)
 }
 
 // AlertKVs sugared log by alert level and key-values.
 func (l Logger) AlertKVs(ctx context.Context, msg string, args ...interface{}) {
-	writeOutput(l.write(ctx, level.Alert, msg, l.kv(ctx, args...)...))
+	l.logKVs(ctx, level.Alert, msg, args...)
 }
 
 // CritKVs sugared log by critcal level and key-values.
 func (l Logger) CritKVs(ctx context.Context, msg string, args ...interface{}) {
-	writeOutput(l.write(ctx, level.Critical, msg, l.kv(ctx, args...)...))
+	l.logKVs(ctx, level.Critical, msg, args...)
 }
 
 // ErrKVs sugared log by error level and key-values.
 func (l Logger) ErrKVs(ctx context.Context, msg string, args ...interface{}) {
-	writeOutput(l.write(ctx, level.Error, msg, l.kv(ctx, args...)...))
+	l.logKVs(ctx, level.Error, msg, args...)
 }
 
 // WarnKVs sugared log by warning level and key-values.
 func (l Logger) WarnKVs(ctx context.Context, msg string, args ...interface{}) {
-	writeOutput(l.write(ctx, level.Warning, msg, l.kv(ctx, args...)...))
+	l.logKVs(ctx, level.Warning, msg, args...)
 }
 
 // NoticeKVs sugared log by notice level and key-values.
 func (l Logger) NoticeKVs(ctx context.Context, msg string, args ...interface{}) {
-	writeOutput(l.write(ctx, level.Notice, msg, l.kv(ctx, args...)...))
+	l.logKVs(ctx, level.Notice, msg, args...)
 }
 
 // InfoKVs sugared log by info level and key-values.
 func (l Logger) InfoKVs(ctx context.Context, msg string, args ...interface{}) {
-	writeOutput(l.write(ctx, level.Info, msg, l.kv(ctx, args...)...))
+	l.logKVs(ctx, level.Info, msg, args...)
 }
 
 // DebugKVs sugared log by debug level and key-values.
 func (l Logger) DebugKVs(ctx context.Context, msg string, args ...interface{}) {
-	writeOutput(l.write(ctx, level.Debug, msg, l.kv(ctx, args...)...))
+	l.logKVs(ctx, level.Debug, msg, args...)
 }
 
 // EmergKV log by emergency level and key-values.
 func (l Logger) EmergKV(ctx context.Context, msg string, args ...field.Field) {
-	writeOutput(l.write(ctx, level.Emergency, msg, args...))
+	l.logKV(ctx, level.Emergency, msg, args...)
 }
 
 // AlertKV log by alert level and key-values.
 func (l Logger) AlertKV(ctx context.Context, msg string, args ...field.Field) {
-	writeOutput(l.write(ctx, level.Alert, msg, args...))
+	l.logKV(ctx, level.Alert, msg, args...)
 }
 
 // CritKV log by critcal level and key-values.
 func (l Logger) CritKV(ctx context.Context, msg string, args ...field.Field) {
-	writeOutput(l.write(ctx, level.Critical, msg, args...))
+	l.logKV(ctx, level.Critical, msg, args...)
 }
 
 // ErrKV log by error level and key-values.
 func (l Logger) ErrKV(ctx context.Context, msg string, args ...field.Field) {
-	writeOutput(l.write(ctx, level.Error, msg, args...))
+	l.logKV(ctx, level.Error, msg, args...)
 }
 
 // WarnKV log by warning level and key-values.
 func (l Logger) WarnKV(ctx context.Context, msg string, args ...field.Field) {
-	writeOutput(l.write(ctx, level.Warning, msg, args...))
+	l.logKV(ctx, level.Warning, msg, args...)
 }
 
 // NoticeKV log by notice level and key-values.
 func (l Logger) NoticeKV(ctx context.Context, msg string, args ...field.Field) {
-	writeOutput(l.write(ctx, level.Notice, msg, args...))
+	l.logKV(ctx, level.Notice, msg, args...)
 }
 
 // InfoKV log by info level and key-values.
 func (l Logger) InfoKV(ctx context.Context, msg string, args ...field.Field) {
-	writeOutput(l.write(ctx, level.Info, msg, args...))
+	l.logKV(ctx, level.Info, msg, args...)
 }
 
 // DebugKV log by debug level and key-values.
 func (l Logger) DebugKV(ctx context.Context, msg string, args ...field.Field) {
-	writeOutput(l.write(ctx, level.Debug, msg, args...))
+	l.logKV(ctx, level.Debug, msg, args...)
 }
 
 // Emergf log by emergency level by format and arguments.
 func (l Logger) Emergf(ctx context.Context, format string, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Emergency, format, args...))
+	l.logf(ctx, level.Emergency, format, args...)
 }
 
 // Alertf log by alert level by format and arguments.
 func (l Logger) Alertf(ctx context.Context, format string, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Alert, format, args...))
+	l.logf(ctx, level.Alert, format, args...)
 }
 
 // Critf log by critical level by format and arguments.
 func (l Logger) Critf(ctx context.Context, format string, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Critical, format, args...))
+	l.logf(ctx, level.Critical, format, args...)
 }
 
 // Errf log by error level by format and arguments.
 func (l Logger) Errf(ctx context.Context, format string, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Error, format, args...))
+	l.logf(ctx, level.Error, format, args...)
 }
 
 // Warnf log by warning level by format and arguments.
 func (l Logger) Warnf(ctx context.Context, format string, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Warning, format, args...))
+	l.logf(ctx, level.Warning, format, args...)
 }
 
 // Noticef log by notice level by format and arguments.
 func (l Logger) Noticef(ctx context.Context, format string, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Notice, format, args...))
+	l.logf(ctx, level.Notice, format, args...)
 }
 
 // Infof log by info level by format and arguments.
 func (l Logger) Infof(ctx context.Context, format string, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Info, format, args...))
+	l.logf(ctx, level.Info, format, args...)
 }
 
 // Debugf log by debug level by format and arguments.
 func (l Logger) Debugf(ctx context.Context, format string, args ...interface{}) {
-	writeOutput(l.writef(ctx, level.Debug, format, args...))
+	l.logf(ctx, level.Debug, format, args...)
 }
 
 // Printf log by info level by format and arguments without context.
 func (l Logger) Printf(format string, args ...interface{}) {
-	writeOutput(l.writef(context.Background(), level.Info, format, args...))
+	l.logf(context.Background(), level.Info, format, args...)
 }
 
 // Fatalf log by alert level by format and arguments without context.
 func (l Logger) Fatalf(format string, args ...interface{}) {
-	writeOutput(l.writef(context.Background(), level.Alert, format, args...))
+	l.logf(context.Background(), level.Alert, format, args...)
 }
 
 // Panicf log by emergency level and arguments without context.
 func (l Logger) Panicf(format string, args ...interface{}) {
-	writeOutput(l.writef(context.Background(), level.Emergency, format, args...))
+	l.logf(context.Background(), level.Emergency, format, args...)
 }
 
 func (l Logger) Writer(ctx context.Context, level level.Level, fields ...field.Field) io.Writer {
@@ -306,7 +316,6 @@ func (l Logger) Writer(ctx context.Context, level level.Level, fields ...field.F
 	}
 }
 
-//nolint:containedctx
 type writer struct {
 	ctx    context.Context
 	level  level.Level

logger_example_caller_test.go

@@ -13,10 +13,8 @@ func ExampleNew_withCaller() {
 	)
 	logger.Err(ctx, "same error message")
 	logger.InfoKVs(ctx, "same info message", "api-version", 0.1)
-	_, _ = logger.Write([]byte("same write message"))
 
 	// Output:
 	// msg="same error message" level=error caller=logger_example_caller_test.go:14
 	// msg="same info message" api-version=0.1 level=info caller=logger_example_caller_test.go:15
-	// msg="same write message" level=info caller=logger_example_caller_test.go:16
 }

logger_example_test.go

@@ -51,15 +51,12 @@ func ExampleNew_debugKV() {
 }
 
 func ExampleNew_level() {
-	logger := log.New(log.WithStdout()).With(log.WithLevel("level", level.Error))
-	logger.Err(ctx, "same error message")
-	// Output: msg="same error message" level=error
-}
-
-func ExampleNew_level_info() {
 	logger := log.New(log.WithStdout()).With(log.WithLevel("level", level.Error))
 	logger.Info(ctx, "same message")
 	// Output:
+
+	logger.Err(ctx, "same error message")
+	// Output: msg="same error message" level=error
 }
 
 func ExampleNew_jsonFormat() {
@@ -69,7 +66,7 @@ func ExampleNew_jsonFormat() {
 			log.GoVersion("go-version"),
 		)
 	logger.Err(ctx, "same error message")
-	// Output: {"go-version":"go1.18.1","level":"error","msg":"same error message"}
+	// Output: {"go-version":"go1.15.2","level":"error","msg":"same error message"}
 }
 
 func ExampleNew_textEncoding() {
@@ -82,8 +79,8 @@ func ExampleNew_textEncoding() {
 	logger.InfoKVs(ctx, "same info message", "api-version", 0.1)
 
 	// Output:
-	// msg="same error message" level=error go-version=go1.18.1
+	// msg="same error message" level=error go-version=go1.15.2
-	// msg="same info message" api-version=0.1 level=info go-version=go1.18.1
+	// msg="same info message" api-version=0.1 level=info go-version=go1.15.2
 }
 
 type ctxKey string
@@ -105,7 +102,7 @@ func ExampleWith() {
 		levelInfo, log.WithContextValue(requestID), log.KeyValue("api", "0.1.0"), log.GoVersion("go"),
 	)
 	logger.Info(vctx, "same message")
-	// Output: msg="same message" level=info requestID=6a5fa048-7181-11ea-bc55-0242ac130003 api=0.1.0 go=go1.18.1
+	// Output: msg="same message" level=info requestID=6a5fa048-7181-11ea-bc55-0242ac130003 api=0.1.0 go=go1.15.2
 }
 
 func ExampleLogger_Print() {
@@ -114,7 +111,7 @@ func ExampleLogger_Print() {
 		levelInfo, log.KeyValue("client", "http"), log.KeyValue("api", "0.1.0"), log.GoVersion("go"),
 	)
 	logger.Print("same message")
-	// Output: msg="same message" level=info client=http api=0.1.0 go=go1.18.1
+	// Output: msg="same message" level=info client=http api=0.1.0 go=go1.15.2
 }
 
 func ExamplePrint() {

logger_example_trace_test.go

@@ -8,8 +8,9 @@ import (
 	"gitoa.ru/go-4devs/log"
 	"gitoa.ru/go-4devs/log/field"
 	"gitoa.ru/go-4devs/log/handler/otel"
+	apitrace "go.opentelemetry.io/otel/api/trace"
+	"go.opentelemetry.io/otel/sdk/export/trace"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
-	"go.opentelemetry.io/otel/trace"
 )
 
 func ExampleNew_withTrace() {
@@ -32,7 +33,7 @@ func ExampleNew_withTrace() {
 	// event: log logrus kv sugar, SeverityText = ERROR, SeverityNumber = 17, err = EOF
 }
 
-func startSpan(ctx context.Context) (context.Context, trace.Span) {
+func startSpan(ctx context.Context) (context.Context, apitrace.Span) {
 	tp := sdktrace.NewTracerProvider(sdktrace.WithSyncer(exporter{}))
 
 	return tp.Tracer("logger").Start(ctx, "operation")
@@ -44,9 +45,9 @@ func (e exporter) Shutdown(_ context.Context) error {
 	return nil
 }
 
-func (e exporter) ExportSpans(ctx context.Context, spanData []sdktrace.ReadOnlySpan) error {
+func (e exporter) ExportSpans(ctx context.Context, spanData []*trace.SpanData) error {
 	for _, data := range spanData {
-		for _, events := range data.Events() {
+		for _, events := range data.MessageEvents {
 			fmt.Print("event: ", events.Name)
 
 			for _, attr := range events.Attributes {

logger_test.go

@@ -17,8 +17,6 @@ import (
 var requestID ctxKey = "requestID"
 
 func TestFields(t *testing.T) {
-	t.Parallel()
-
 	type rObj struct {
 		id string
 	}
@@ -60,8 +58,6 @@ func TestFields(t *testing.T) {
 }
 
 func TestWriter(t *testing.T) {
-	t.Parallel()
-
 	ctx := context.Background()
 
 	success := "msg=\"info message\" err=file already exists requestID=6a5fa048-7181-11ea-bc55-0242ac1311113 level=info\n"
@@ -88,8 +84,6 @@ func TestWriter(t *testing.T) {
 }
 
 func TestLogger(t *testing.T) {
-	t.Parallel()
-
 	ctx := context.Background()
 	buf := &bytes.Buffer{}
 	logger := log.New(log.WithWriter(buf)).With(log.WithContextValue(requestID), log.WithLevel("level", level.Info))

middleware.go

@@ -30,7 +30,7 @@ func With(logger Logger, mw ...Middleware) Logger {
 
 	lastI := len(mw) - 1
 
-	return func(ctx context.Context, data *entry.Entry) (int, error) {
+	return func(ctx context.Context, e *entry.Entry) (int, error) {
 		var (
 			chainHandler func(context.Context, *entry.Entry) (int, error)
 			curI         int
@@ -47,7 +47,7 @@ func With(logger Logger, mw ...Middleware) Logger {
 			return n, err
 		}
 
-		return mw[0](ctx, data, chainHandler)
+		return mw[0](ctx, e, chainHandler)
 	}
 }
 
@@ -62,16 +62,16 @@ func WithLevel(key string, lvl level.Level) Middleware {
 	}
 }
 
-func WithClosure(ctx context.Context, data *entry.Entry, handler Logger) (int, error) {
+func WithClosure(ctx context.Context, e *entry.Entry, handler Logger) (int, error) {
-	for i, field := range data.Fields() {
+	for i, field := range e.Fields() {
 		if field.Type().IsAny() {
 			if f, ok := field.AsInterface().(func() string); ok {
-				data.Fields().Set(i, field.Key().String(f()))
+				e.Fields().Set(i, field.Key().String(f()))
 			}
 		}
 	}
 
-	return handler(ctx, data)
+	return handler(ctx, e)
 }
 
 // KeyValue add field by const key value.

writter.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"fmt"
 	"io"
 	"os"
 	"strings"
@@ -15,24 +14,19 @@ import (
 
 // New creates standart logger.
 func New(opts ...Option) Logger {
-	logger := log{e: stringFormat(), w: os.Stderr}
+	l := log{e: stringFormat(), w: os.Stderr}
 
 	for _, opt := range opts {
-		opt(&logger)
+		opt(&l)
 	}
 
 	return func(_ context.Context, entry *entry.Entry) (int, error) {
-		b, err := logger.e(entry)
+		b, err := l.e(entry)
 		if err != nil {
-			return 0, fmt.Errorf("enode err: %w", err)
+			return 0, err
 		}
 
-		n, err := logger.w.Write(b)
+		return l.w.Write(b)
-		if err != nil {
-			return 0, fmt.Errorf("failed write: %w", err)
-		}
-
-		return n, nil
 	}
 }
 
@@ -76,7 +70,6 @@ func WithJSONFormat() Option {
 	return WithEncode(jsonFormat)
 }
 
-//nolint:forcetypeassert
 func stringFormat() func(entry *entry.Entry) ([]byte, error) {
 	pool := sync.Pool{
 		New: func() interface{} {
@@ -85,34 +78,34 @@ func stringFormat() func(entry *entry.Entry) ([]byte, error) {
 	}
 
 	return func(entry *entry.Entry) ([]byte, error) {
-		buf := pool.Get().(*bytes.Buffer)
+		b := pool.Get().(*bytes.Buffer)
-		buf.Reset()
+		b.Reset()
 
 		defer func() {
-			pool.Put(buf)
+			pool.Put(b)
 		}()
 
-		buf.WriteString("msg=\"")
+		b.WriteString("msg=\"")
-		buf.WriteString(strings.TrimSpace(entry.Message()))
+		b.WriteString(strings.TrimSpace(entry.Message()))
-		buf.WriteString("\"")
+		b.WriteString("\"")
 
 		for _, field := range entry.Fields() {
-			buf.WriteString(" ")
+			b.WriteString(" ")
-			buf.WriteString(string(field.Key()))
+			b.WriteString(string(field.Key()))
-			buf.WriteString("=")
+			b.WriteString("=")
-			buf.WriteString(field.Value().String())
+			b.WriteString(field.Value().String())
 		}
 
-		buf.WriteString("\n")
+		b.WriteString("\n")
 
-		return buf.Bytes(), nil
+		return b.Bytes(), nil
 	}
 }
 
 func jsonFormat(entry *entry.Entry) ([]byte, error) {
 	res, err := json.Marshal(entry.AddString("msg", entry.Message()).Fields().AsMap())
 	if err != nil {
-		return nil, fmt.Errorf("marshal err: %w", err)
+		return nil, err
 	}
 
 	return append(res, []byte("\n")...), nil