Merge pull request 'update ling and go version' (#17) from format into master

Reviewed-on: #17

.drone.yml

@@ -5,7 +5,7 @@ name: logger
 
 steps:
 - name: test 
-  image: golang:1.21.5
+  image: golang:1.22.2
   volumes:
   - name: deps
     path: /go/src/mod
@@ -13,7 +13,7 @@ steps:
   - go test 
 
 - name: golangci-lint
-  image: golangci/golangci-lint:v1.55
+  image: golangci/golangci-lint:v1.57
   commands:
   - golangci-lint run
 

bench_test.go

@@ -166,7 +166,9 @@ func BenchmarkDisabledAccumulatedContext(b *testing.B) {
 
 	b.Run("4devs/log.Context", func(b *testing.B) {
 		b.ResetTimer()
+
 		logger := NewLogger().With(log.GoVersion("goversion"))
+
 		b.RunParallel(func(pb *testing.PB) {
 			for pb.Next() {
 				logger.InfoKV(ctx, getMessage(0), fakeFields()...)

example/log.go

@@ -21,7 +21,7 @@ func main() {
 	logger.AlertKV(ctx, "alert message new logger", field.String("string", "value"))
 	service(ctx, logger)
 
-	strLogger := log.New(log.WithFormat(log.FormatWithBracket())).With(log.WithSource(10, log.TrimPath), log.WithTime(log.KeyTime, time.RFC3339))
+	strLogger := log.New(log.WithFormat(log.FormatWithBracket(field.NewEncoderText()))).With(log.WithSource(10, log.TrimPath), log.WithTime(log.KeyTime, time.RFC3339))
 	strLogger.AlertKV(ctx, "alert message new txt logger", field.String("string", "value"))
 	service(ctx, strLogger)
 }

field/encoder.go

@@ -174,6 +174,7 @@ func needsQuoting(in string) bool {
 			if char != '\\' && (char == ' ' || char == '=' || !safeSet[char]) {
 				return true
 			}
+
 			i++
 
 			continue

logger_example_test.go

@@ -213,8 +213,8 @@ func ExampleNew_jsonFormat() {
 	logger.Err(ctx, "same error message")
 	logger.WarnKVs(ctx, "same warn message", "obj", Obj{Name: "obj name"})
 	// Output:
-	// {"msg":"same error message","level":"error","go-version":"go1.21.5"}
+	// {"msg":"same error message","level":"error","go-version":"go1.22.2"}
-	// {"msg":"same warn message","obj":{"Name":"obj name","IsEnable":false},"level":"warning","go-version":"go1.21.5"}
+	// {"msg":"same warn message","obj":{"Name":"obj name","IsEnable":false},"level":"warning","go-version":"go1.22.2"}
 }
 
 func ExampleNew_textEncoding() {
@@ -227,8 +227,8 @@ func ExampleNew_textEncoding() {
 	logger.InfoKVs(ctx, "same info message", "api-version", 0.1, "obj", Obj{Name: "text value", IsEnable: true})
 
 	// Output:
-	// msg="same error message" level=error go-version=go1.21.5
+	// msg="same error message" level=error go-version=go1.22.2
-	// msg="same info message" api-version=0.1 obj={Name:text value IsEnable:true} level=info go-version=go1.21.5
+	// msg="same info message" api-version=0.1 obj={Name:text value IsEnable:true} level=info go-version=go1.22.2
 }
 
 type ctxKey string
@@ -252,7 +252,7 @@ func ExampleWith() {
 		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.21.5
+	// Output: msg="same message" level=info requestID=6a5fa048-7181-11ea-bc55-0242ac130003 api=0.1.0 go=go1.22.2
 }
 
 func ExampleLogger_Print() {
@@ -263,7 +263,7 @@ func ExampleLogger_Print() {
 		log.GoVersion("go"),
 	)
 	logger.Print("same message")
-	// Output: msg="same message" level=info client=http api=0.1.0 go=go1.21.5
+	// Output: msg="same message" level=info client=http api=0.1.0 go=go1.22.2
 }
 
 func ExamplePrint() {

middleware.go

@@ -38,6 +38,7 @@ func With(logger Logger, mw ...Middleware) Logger {
 			if curI == lastI {
 				return logger(currentCtx, currentEntry)
 			}
+
 			curI++
 			n, err := mw[curI](currentCtx, currentEntry, chainHandler)
 			curI--

writer_example_test.go

@@ -20,7 +20,7 @@ func exampleWithTime(key, format string) log.Middleware {
 
 func ExampleFormatWithBracket() {
 	ctx := context.Background()
-	logger := log.New(log.WithFormat(log.FormatWithBracket()), log.WithStdout()).With(
+	logger := log.New(log.WithFormat(log.FormatWithBracket(field.NewEncoderText())), log.WithStdout()).With(
 		log.WithSource(10, filepath.Base),
 		// log.WithTime(log.KeyTime, time.RFC3339),
 		exampleWithTime(log.KeyTime, time.RFC3339),
@@ -32,6 +32,6 @@ func ExampleFormatWithBracket() {
 	serviceLogger := logger.With(log.WithName("service_name"))
 	serviceLogger.Err(ctx, "error message")
 	// Output:
-	// 2038-01-19T06:14:07+03:00 [info] writer_example_test.go:30 "imfo message" num=42
+	// 2038-01-19T03:14:07Z [info] writer_example_test.go:30 "imfo message" num=42
-	// 2038-01-19T06:14:07+03:00 [error][service_name] writer_example_test.go:33 "error message"
+	// 2038-01-19T03:14:07Z [error][service_name] writer_example_test.go:33 "error message"
 }

writter.go

@@ -43,12 +43,12 @@ func WithStdout() func(*option) {
 
 // WithStringFormat sets format as simple string.
 func WithStringFormat() func(*option) {
-	return WithFormat(formatString())
+	return WithFormat(FormatString(field.NewEncoderText()))
 }
 
 // WithJSONFormat sets json output format.
 func WithJSONFormat() func(*option) {
-	return WithFormat(formatJSON())
+	return WithFormat(FormatJSON(field.NewEncoderJSON()))
 }
 
 // WithFormat sets custom output format.
@@ -66,7 +66,7 @@ type option struct {
 // New creates standart logger.
 func New(opts ...func(*option)) Logger {
 	log := option{
-		format: formatString(),
+		format: FormatString(field.NewEncoderText()),
 		out:    os.Stderr,
 	}
 
@@ -79,9 +79,12 @@ func New(opts ...func(*option)) Logger {
 	}
 }
 
-func FormatWithBracket() func(io.Writer, *entry.Entry) (int, error) {
+type Encoder interface {
-	enc := field.NewEncoderText()
+	AppendValue(dst []byte, val field.Value) []byte
+	AppendField(dst []byte, val field.Field) []byte
+}
 
+func FormatWithBracket(enc Encoder) func(io.Writer, *entry.Entry) (int, error) {
 	appendValue := func(buf *buffer.Buffer, data field.Fields, key, prefix, suffix string) *buffer.Buffer {
 		data.Fields(
 			func(f field.Field) bool {
@@ -133,9 +136,7 @@ func FormatWithBracket() func(io.Writer, *entry.Entry) (int, error) {
 	}
 }
 
-func formatString() func(io.Writer, *entry.Entry) (int, error) {
+func FormatString(enc Encoder) func(io.Writer, *entry.Entry) (int, error) {
-	enc := field.NewEncoderText()
-
 	return func(w io.Writer, entry *entry.Entry) (int, error) {
 		buf := buffer.New()
 		defer func() {
@@ -159,9 +160,7 @@ func formatString() func(io.Writer, *entry.Entry) (int, error) {
 	}
 }
 
-func formatJSON() func(w io.Writer, entry *entry.Entry) (int, error) {
+func FormatJSON(enc Encoder) func(w io.Writer, entry *entry.Entry) (int, error) {
-	enc := field.NewEncoderJSON()
-
 	return func(w io.Writer, entry *entry.Entry) (int, error) {
 		buf := buffer.New()
 		defer func() {