diff --git a/log/zap/core.go b/log/zap/core.go index fc0a81e7e18fae3e84500cda61473175d724b39b..f2b220eab78a6cd2416408385b521c743bcefb94 100644 --- a/log/zap/core.go +++ b/log/zap/core.go @@ -72,8 +72,8 @@ func (core *Core) getEntry(entry zapcore.Entry, fields []zapcore.Field) *log.Ent ent.Category, _ = enc.Fields["category"].(string) ent.Component, _ = enc.Fields["component"].(string) ent.Event, _ = enc.Fields["event"].(string) - ent.ObjectID, _ = enc.Fields["object_id"].(*oid.ObjectId) - ent.CallerID, _ = enc.Fields["caller_id"].(*oid.ObjectId) + ent.ObjectID, _ = enc.Fields["object"].(*oid.ObjectId) + ent.CallerID, _ = enc.Fields["caller"].(*oid.ObjectId) ent.Attr = enc.Fields["attr"] if tags, ok := enc.Fields["tags"].([]any); ok { diff --git a/log/zap/core_test.go b/log/zap/core_test.go index b61e11b2a2be249d0ed558bc9f6c8d4f98fc7f66..f78916cb9faeb197179cebbaa608735d86ceddee 100644 --- a/log/zap/core_test.go +++ b/log/zap/core_test.go @@ -33,8 +33,8 @@ func TestCore_getEntry(t *testing.T) { Category("create"), Component("Items.Service"), Event("Items.Create"), - ObjectID("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl"), - CallerID("/users/PHVz"), + Object("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl"), + Caller("/users/PHVz"), Attr("any"), Tags("tag1", "tag2", "tag3"), }, diff --git a/log/zap/example_test.go b/log/zap/example_test.go index 2dad64d670a5d44da36980bf80475f79089dd9b5..d99b83c23b4ae05eaa091d2c8e96e1820b90d6fb 100644 --- a/log/zap/example_test.go +++ b/log/zap/example_test.go @@ -75,16 +75,16 @@ func TestExample(t *testing.T) { // Отправка лога при создании item logger.Info("Successfully created", Event(items.EventCreateItem), - ObjectID(item), - CallerIDFromContext(ctx), + Object(item), + CallerFromContext(ctx), Tags("tag1", "tag2", "tag3"), ) // Отправка лога при обновлении item logger.Warn("Successfully updated", Event(items.EventUpdateItem), - ObjectID(item), - CallerIDFromContext(ctx), + Object(item), + CallerFromContext(ctx), Attr(map[string]map[string]any{"title": {"old": "old title", "new": "new title"}}), ) }