diff --git a/.drone.yml b/.drone.yml index f49d33f..b873675 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ name: logger steps: - name: test - image: golang:1.21.5 + image: golang:1.22 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 diff --git a/bench_test.go b/bench_test.go index 0ee96c1..df0fad5 100644 --- a/bench_test.go +++ b/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()...) diff --git a/example/log.go b/example/log.go index 9325882..a8ebfc8 100644 --- a/example/log.go +++ b/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) } diff --git a/field/encoder.go b/field/encoder.go index 86497c1..f2fc9cb 100644 --- a/field/encoder.go +++ b/field/encoder.go @@ -174,6 +174,7 @@ func needsQuoting(in string) bool { if char != '\\' && (char == ' ' || char == '=' || !safeSet[char]) { return true } + i++ continue diff --git a/middleware.go b/middleware.go index 27936c6..bd16860 100644 --- a/middleware.go +++ b/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--