Skip to content
Snippets Groups Projects
Commit 63f97b51 authored by Semyon Krestyaninov's avatar Semyon Krestyaninov
Browse files

fix tests

parent 6e41358f
Branches
Tags
No related merge requests found
...@@ -28,10 +28,12 @@ func NewCore(writeSyncer WriteSyncer) *Core { ...@@ -28,10 +28,12 @@ func NewCore(writeSyncer WriteSyncer) *Core {
} }
func (core *Core) With(fields []zapcore.Field) zapcore.Core { func (core *Core) With(fields []zapcore.Field) zapcore.Core {
enc := core.enc.Clone()
enc.AddFields(fields)
return &Core{ return &Core{
LevelEnabler: core.LevelEnabler, LevelEnabler: core.LevelEnabler,
ws: core.ws, ws: core.ws,
enc: core.enc.With(fields), enc: enc,
} }
} }
......
...@@ -12,7 +12,8 @@ import ( ...@@ -12,7 +12,8 @@ import (
) )
type Encoder interface { type Encoder interface {
With([]zapcore.Field) Encoder Clone() Encoder
AddFields([]zapcore.Field)
EncodeEntry(zapcore.Entry, []zapcore.Field) (*logs.Entry, error) EncodeEntry(zapcore.Entry, []zapcore.Field) (*logs.Entry, error)
} }
...@@ -24,12 +25,16 @@ func NewEntryEncoder() Encoder { ...@@ -24,12 +25,16 @@ func NewEntryEncoder() Encoder {
return &entryEncoder{} return &entryEncoder{}
} }
func (enc *entryEncoder) With(fields []zapcore.Field) Encoder { func (enc *entryEncoder) AddFields(fields []zapcore.Field) {
return enc.with(fields) enc.fields = slices.Concat(enc.fields, fields)
} }
func (enc *entryEncoder) with(fields []zapcore.Field) *entryEncoder { func (enc *entryEncoder) Clone() Encoder {
return &entryEncoder{fields: slices.Concat(enc.fields, fields)} return enc.clone()
}
func (enc *entryEncoder) clone() *entryEncoder {
return &entryEncoder{fields: slices.Clone(enc.fields)}
} }
func (enc *entryEncoder) EncodeEntry(entry zapcore.Entry, fields []zapcore.Field) (*logs.Entry, error) { func (enc *entryEncoder) EncodeEntry(entry zapcore.Entry, fields []zapcore.Field) (*logs.Entry, error) {
...@@ -40,7 +45,8 @@ func (enc *entryEncoder) EncodeEntry(entry zapcore.Entry, fields []zapcore.Field ...@@ -40,7 +45,8 @@ func (enc *entryEncoder) EncodeEntry(entry zapcore.Entry, fields []zapcore.Field
Message: entry.Message, Message: entry.Message,
} }
clone := enc.with(fields) clone := enc.clone()
clone.AddFields(fields)
for i := range clone.fields { for i := range clone.fields {
switch clone.fields[i].Key { switch clone.fields[i].Key {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment