Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| package logger | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "go.uber.org/zap" | ||
| "go.uber.org/zap/zapcore" | ||
|
|
||
| "github.com/rudderlabs/rudder-go-kit/config" | ||
| ) | ||
|
|
||
| // BenchmarkKit results: | ||
| // non-sugared: 496.6 ns/op | ||
| // sugared: 723.5 ns/op | ||
| func BenchmarkKit(b *testing.B) { | ||
| c := config.New() | ||
| c.Set("LOG_LEVEL", "DEBUG") | ||
| c.Set("Logger.consoleJsonFormat", "json") | ||
| c.Set("Logger.discardConsole", true) | ||
| c.Set("Logger.enableFileNameInLog", true) | ||
|
|
||
| b.Run("non-sugared", func(b *testing.B) { | ||
| f := NewFactory(c) | ||
| l := f.NewLogger() | ||
| defer f.Sync() | ||
|
|
||
| fields := []Field{ | ||
| NewStringField("key1", "111"), NewStringField("key2", "222"), | ||
| NewStringField("key3", "333"), NewStringField("key4", "444"), | ||
| NewStringField("key5", "555"), NewStringField("key6", "666"), | ||
| NewStringField("key7", "777"), NewStringField("key8", "888"), | ||
| NewStringField("key9", "999"), NewStringField("key10", "101010"), | ||
| } | ||
|
|
||
| b.ResetTimer() | ||
| b.RunParallel(func(pb *testing.PB) { | ||
| for pb.Next() { | ||
| l.Debugn("test", fields...) | ||
| } | ||
| }) | ||
| }) | ||
|
|
||
| b.Run("sugared", func(b *testing.B) { | ||
| f := NewFactory(c) | ||
| l := f.NewLogger() | ||
| defer f.Sync() | ||
|
|
||
| fields := []any{ | ||
| "key1", "111", "key2", "222", | ||
| "key3", "333", "key4", "444", | ||
| "key5", "555", "key6", "666", | ||
| "key7", "777", "key8", "888", | ||
| "key9", "999", "key10", "101010", | ||
| } | ||
|
|
||
| b.ResetTimer() | ||
| b.RunParallel(func(pb *testing.PB) { | ||
| for pb.Next() { | ||
| l.Debugw("test", fields...) | ||
| } | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| // BenchmarkZap results: | ||
| // Zap: 60.96 ns/op | ||
| // Zap.Sugar: 94.57 ns/op | ||
| func BenchmarkZap(b *testing.B) { | ||
| newZap := func(lvl zapcore.Level) *zap.Logger { | ||
| ec := zap.NewProductionEncoderConfig() | ||
| ec.EncodeDuration = zapcore.NanosDurationEncoder | ||
| ec.EncodeTime = zapcore.EpochNanosTimeEncoder | ||
| enc := zapcore.NewJSONEncoder(ec) | ||
| return zap.New(zapcore.NewCore( | ||
| enc, | ||
| &discarder{}, | ||
| lvl, | ||
| )) | ||
| } | ||
| b.Run("Zap", func(b *testing.B) { | ||
| logger := newZap(zapcore.DebugLevel) | ||
| b.ResetTimer() | ||
| b.RunParallel(func(pb *testing.PB) { | ||
| for pb.Next() { | ||
| logger.Debug("message", zap.String("key1", "111"), zap.String("key2", "222")) | ||
| } | ||
| }) | ||
| }) | ||
| b.Run("Zap.Sugar", func(b *testing.B) { | ||
| logger := newZap(zapcore.DebugLevel).Sugar() | ||
| b.ResetTimer() | ||
| b.RunParallel(func(pb *testing.PB) { | ||
| for pb.Next() { | ||
| logger.Debugw("message", "key1", "111", "key2", "222") | ||
| } | ||
| }) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| package logger | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "go.uber.org/zap" | ||
| ) | ||
|
|
||
| type FieldType uint8 | ||
|
|
||
| const ( | ||
| UnknownType FieldType = iota | ||
| StringType | ||
| IntType | ||
| BoolType | ||
| FloatType | ||
| TimeType | ||
| DurationType | ||
| ErrorType | ||
| ) | ||
|
|
||
| type Field struct { | ||
| name string | ||
| fieldType FieldType | ||
|
|
||
| unknown any | ||
| string string | ||
| int int64 | ||
| bool bool | ||
| float float64 | ||
| time time.Time | ||
| duration time.Duration | ||
| error error | ||
| } | ||
|
|
||
| func (f Field) Name() string { return f.name } | ||
| func (f Field) Value() any { | ||
| switch f.fieldType { | ||
| case StringType: | ||
| return f.string | ||
| case IntType: | ||
| return f.int | ||
| case BoolType: | ||
| return f.bool | ||
| case FloatType: | ||
| return f.float | ||
| case TimeType: | ||
| return f.time | ||
| case DurationType: | ||
| return f.duration | ||
| case ErrorType: | ||
| return f.error | ||
| default: | ||
| return f.unknown | ||
| } | ||
| } | ||
|
|
||
| func (f Field) toZap() zap.Field { | ||
| switch f.fieldType { | ||
| case StringType: | ||
| return zap.String(f.name, f.string) | ||
| case IntType: | ||
| return zap.Int64(f.name, f.int) | ||
| case BoolType: | ||
| return zap.Bool(f.name, f.bool) | ||
| case FloatType: | ||
| return zap.Float64(f.name, f.float) | ||
| case TimeType: | ||
| return zap.Time(f.name, f.time) | ||
| case DurationType: | ||
| return zap.Duration(f.name, f.duration) | ||
| case ErrorType: | ||
| return zap.Error(f.error) | ||
| default: | ||
| return zap.Any(f.name, f.unknown) | ||
| } | ||
| } | ||
|
|
||
| func NewField(key string, v any) Field { return Field{name: key, unknown: v} } | ||
|
|
||
| func NewStringField(key, v string) Field { | ||
| return Field{name: key, string: v, fieldType: StringType} | ||
| } | ||
|
|
||
| func NewIntField(key string, v int64) Field { | ||
| return Field{name: key, int: v, fieldType: IntType} | ||
| } | ||
|
|
||
| func NewBoolField(key string, v bool) Field { | ||
| return Field{name: key, bool: v, fieldType: BoolType} | ||
| } | ||
|
|
||
| func NewFloatField(key string, v float64) Field { | ||
| return Field{name: key, float: v, fieldType: FloatType} | ||
| } | ||
|
|
||
| func NewTimeField(key string, v time.Time) Field { | ||
| return Field{name: key, time: v, fieldType: TimeType} | ||
| } | ||
|
|
||
| func NewDurationField(key string, v time.Duration) Field { | ||
| return Field{name: key, duration: v, fieldType: DurationType} | ||
| } | ||
|
|
||
| func NewErrorField(v error) Field { | ||
| return Field{error: v, fieldType: ErrorType} | ||
| } | ||
|
|
||
| // Expand is useful if you want to use the type Field with the sugared logger | ||
| // e.g. l.Infow("my message", logger.Expand(f1, f2, f3)...) | ||
| func Expand(fields ...Field) []any { | ||
| result := make([]any, 0, len(fields)*2) | ||
| for _, field := range fields { | ||
| result = append(result, field.name, field.Value()) | ||
| } | ||
| return result | ||
| } | ||
|
|
||
| func toZap(fields []Field) []zap.Field { | ||
| result := make([]zap.Field, 0, len(fields)) | ||
| for _, field := range fields { | ||
| result = append(result, field.toZap()) | ||
| } | ||
| return result | ||
| } | ||
Oops, something went wrong.