diff --git a/logs/zap/buffered_write_syncer_test.go b/logs/zap/buffered_write_syncer_test.go index 77b6ca24c2d0ae4df23425e5a35ee2082171b043..073663edc829dd1847ce416b704916ec92ccc80c 100644 --- a/logs/zap/buffered_write_syncer_test.go +++ b/logs/zap/buffered_write_syncer_test.go @@ -24,10 +24,10 @@ func TestBufferedWriteSyncer_Write(t *testing.T) { ws := &BufferedWriteSyncer{Service: service} - err := ws.Write(&logs.Entry{Message: "first logs message"}) + err := ws.Write(&logs.Entry{Message: "first log message"}) require.NoError(t, err) - err = ws.Write(&logs.Entry{Message: "second logs message"}) + err = ws.Write(&logs.Entry{Message: "second log message"}) require.NoError(t, err) err = ws.Stop() @@ -53,7 +53,7 @@ func TestBufferedWriteSyncer_Write_Concurrent(t *testing.T) { wg.Add(1) go func(wg *sync.WaitGroup) { defer wg.Done() - require.NoError(t, ws.Write(&logs.Entry{Message: "logs message"})) + require.NoError(t, ws.Write(&logs.Entry{Message: "log message"})) }(&wg) } @@ -77,7 +77,7 @@ func TestBufferedWriteSyncer_Flush(t *testing.T) { for i := 0; i < 10; i++ { for j := 0; j < 10; j++ { - require.NoError(t, ws.Write(&logs.Entry{Message: "logs message"})) + require.NoError(t, ws.Write(&logs.Entry{Message: "log message"})) } require.NoError(t, ws.Sync()) } @@ -100,7 +100,7 @@ func TestBufferedWriteSyncer_MaxBufferSize(t *testing.T) { ws := &BufferedWriteSyncer{Service: service, MaxBufferSize: 10} for i := 0; i < 100; i++ { - require.NoError(t, ws.Write(&logs.Entry{Message: "logs message"})) + require.NoError(t, ws.Write(&logs.Entry{Message: "log message"})) } require.NoError(t, ws.Stop()) @@ -121,7 +121,7 @@ func TestBufferedWriteSyncer_FlushInterval(t *testing.T) { ws := &BufferedWriteSyncer{Service: service, FlushInterval: time.Second} for j := 0; j < 10; j++ { - require.NoError(t, ws.Write(&logs.Entry{Message: "logs message"})) + require.NoError(t, ws.Write(&logs.Entry{Message: "log message"})) } time.Sleep(3 * time.Second) // ждем, пока сработает интервал diff --git a/pkg/collections/middleware/logging_middleware.go b/pkg/collections/middleware/logging_middleware.go index 1827c96b0e8fe8fe828cf04028208e733d6bc54b..c5e2e2fb3e5bf604fdb57c8484f4a20289029da6 100644 --- a/pkg/collections/middleware/logging_middleware.go +++ b/pkg/collections/middleware/logging_middleware.go @@ -1,5 +1,5 @@ // Code generated by gowrap. DO NOT EDIT. -// template: ../../../assets/templates/middleware/logs.tmpl +// template: ../../../assets/templates/middleware/log.tmpl // gowrap: http://github.com/hexdigest/gowrap package middleware diff --git a/zap/filter_core.go b/zap/filter_core.go index 8f92b8003105949c65de84d5a3d0f891245df127..7e99d942e439afc8a05faaf55be29b8cb604b7fc 100644 --- a/zap/filter_core.go +++ b/zap/filter_core.go @@ -67,8 +67,8 @@ type filterCore struct { // core = WithFilters(core, ContainsField(zap.Int("a", 5))) // // logger := zap.New(core) -// logger.Info("Test logs") // НЕ будет записан -// logger.Info("Test logs", zap.Int("a", 5)) // будет записан +// logger.Info("Test log") // НЕ будет записан +// logger.Info("Test log", zap.Int("a", 5)) // будет записан func WithFilters(core zapcore.Core, filters ...FilterFunc) zapcore.Core { return &filterCore{ Core: core,