diff --git a/log/zap/buffered_write_syncer_test.go b/log/zap/buffered_write_syncer_test.go index 58e40098bb2370b7899d31fc42c2ea569ca81cf7..58d64fa9f6a612f58701e5284262b505ec190cc5 100644 --- a/log/zap/buffered_write_syncer_test.go +++ b/log/zap/buffered_write_syncer_test.go @@ -53,16 +53,12 @@ func TestBufferedWriteSyncer_Write_Concurrent(t *testing.T) { wg.Add(1) go func(wg *sync.WaitGroup) { defer wg.Done() - - err := ws.Write(&log.Entry{Message: "log message"}) - require.NoError(t, err) + require.NoError(t, ws.Write(&log.Entry{Message: "log message"})) }(&wg) } wg.Wait() - - err := ws.Stop() - require.NoError(t, err) + require.NoError(t, ws.Stop()) service.AssertExpectations(t) } @@ -81,15 +77,12 @@ func TestBufferedWriteSyncer_Flush(t *testing.T) { for i := 0; i < 10; i++ { for j := 0; j < 10; j++ { - err := ws.Write(&log.Entry{Message: "log message"}) - require.NoError(t, err) + require.NoError(t, ws.Write(&log.Entry{Message: "log message"})) } - err := ws.Sync() - require.NoError(t, err) + require.NoError(t, ws.Sync()) } - err := ws.Stop() - require.NoError(t, err) + require.NoError(t, ws.Stop()) service.AssertExpectations(t) } @@ -107,12 +100,10 @@ func TestBufferedWriteSyncer_MaxBufferSize(t *testing.T) { ws := &BufferedWriteSyncer{Service: service, MaxBufferSize: 10} for i := 0; i < 100; i++ { - err := ws.Write(&log.Entry{Message: "log message"}) - require.NoError(t, err) + require.NoError(t, ws.Write(&log.Entry{Message: "log message"})) } - err := ws.Stop() - require.NoError(t, err) + require.NoError(t, ws.Stop()) service.AssertExpectations(t) } @@ -130,14 +121,11 @@ func TestBufferedWriteSyncer_FlushInterval(t *testing.T) { ws := &BufferedWriteSyncer{Service: service, FlushInterval: time.Second} for j := 0; j < 10; j++ { - err := ws.Write(&log.Entry{Message: "log message"}) - require.NoError(t, err) + require.NoError(t, ws.Write(&log.Entry{Message: "log message"})) } time.Sleep(3 * time.Second) // ждем, пока сработает интервал - - err := ws.Stop() - require.NoError(t, err) + require.NoError(t, ws.Stop()) service.AssertExpectations(t) } diff --git a/log/zap/core_test.go b/log/zap/core_test.go index 51b222bdc002c6ed74bb2e81fc8c84be59f95cba..8b2d64d75c737164f38b911fcbd4a9a0e0c56101 100644 --- a/log/zap/core_test.go +++ b/log/zap/core_test.go @@ -5,7 +5,7 @@ import ( "git.perx.ru/perxis/perxis-go/id" "git.perx.ru/perxis/perxis-go/log" - zap2 "git.perx.ru/perxis/perxis-go/zap" + logzap "git.perx.ru/perxis/perxis-go/zap" "github.com/stretchr/testify/require" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -31,13 +31,13 @@ func TestCore_getEntry(t *testing.T) { entry: zapcore.Entry{Level: zapcore.InfoLevel, Message: "создан элемент коллекции"}, fields: []zapcore.Field{ zap.String("key", "val"), // будет проигнорировано - zap2.Category("create"), - zap2.Component("Items.Service"), - zap2.Event("Items.Create"), - zap2.Object("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl"), - zap2.Caller("/users/PHVz"), - zap2.Attr("any"), - zap2.Tags("tag1", "tag2", "tag3"), + logzap.Category("create"), + logzap.Component("Items.Service"), + logzap.Event("Items.Create"), + logzap.Object("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl"), + logzap.Caller("/users/PHVz"), + logzap.Attr("any"), + logzap.Tags("tag1", "tag2", "tag3"), }, }, want: &log.Entry{ diff --git a/log/zap/example_test.go b/log/zap/example_test.go index ee51ef0345b01a88993e30c24a38f7e89bbe5929..0ffb282a6c2c91cff4c203e8500773c3630fdfa8 100644 --- a/log/zap/example_test.go +++ b/log/zap/example_test.go @@ -13,7 +13,7 @@ import ( "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/users" usersmocks "git.perx.ru/perxis/perxis-go/pkg/users/mocks" - zap2 "git.perx.ru/perxis/perxis-go/zap" + logzap "git.perx.ru/perxis/perxis-go/zap" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "go.uber.org/zap" @@ -29,7 +29,7 @@ func TestExample(t *testing.T) { LogLevel: log.Level(zapcore.InfoLevel), Message: "Successfully created", Component: "Items", - Event: items.EventCreateItem, + Event: items.EventItemCreate, ObjectID: id.MustObjectId(item), CallerID: id.MustObjectId(user), Tags: []string{"tag1", "tag2", "tag3"}, @@ -38,7 +38,7 @@ func TestExample(t *testing.T) { LogLevel: log.Level(zapcore.WarnLevel), Message: "Successfully updated", Component: "Items", - Event: items.EventUpdateItem, + Event: items.EventItemUpdate, ObjectID: id.MustObjectId(item), CallerID: id.MustObjectId(user), Attr: map[string]map[string]any{"title": {"old": "old title", "new": "new title"}}, @@ -70,23 +70,23 @@ func TestExample(t *testing.T) { // Пример отправки логов для сервиса Items { - logger := logger.With(zap2.Component("Items")) + logger := logger.With(logzap.Component("Items")) ctx := auth.WithPrincipal(context.Background(), factory.User("74d90aaf")) // Отправка лога при создании item logger.Info("Successfully created", - zap2.Event(items.EventCreateItem), - zap2.Object(item), - zap2.CallerFromContext(ctx), - zap2.Tags("tag1", "tag2", "tag3"), + logzap.Event(items.EventItemCreate), + logzap.Object(item), + logzap.CallerFromContext(ctx), + logzap.Tags("tag1", "tag2", "tag3"), ) // Отправка лога при обновлении item logger.Warn("Successfully updated", - zap2.Event(items.EventUpdateItem), - zap2.Object(item), - zap2.CallerFromContext(ctx), - zap2.Attr(map[string]map[string]any{"title": {"old": "old title", "new": "new title"}}), + logzap.Event(items.EventItemUpdate), + logzap.Object(item), + logzap.CallerFromContext(ctx), + logzap.Attr(map[string]map[string]any{"title": {"old": "old title", "new": "new title"}}), ) }