diff --git a/pkg/log/zap/buffered_write_syncer.go b/log/zap/buffered_write_syncer.go similarity index 99% rename from pkg/log/zap/buffered_write_syncer.go rename to log/zap/buffered_write_syncer.go index 7ded0afaa8d8e1438a12da272f5c9757dccca175..6e2edc6f5d8588c4246b85f6722531b558df163c 100644 --- a/pkg/log/zap/buffered_write_syncer.go +++ b/log/zap/buffered_write_syncer.go @@ -5,8 +5,8 @@ import ( "sync" "time" + "git.perx.ru/perxis/perxis-go/log" "git.perx.ru/perxis/perxis-go/pkg/errors" - "git.perx.ru/perxis/perxis-go/pkg/log" ) const ( diff --git a/pkg/log/zap/buffered_write_syncer_test.go b/log/zap/buffered_write_syncer_test.go similarity index 100% rename from pkg/log/zap/buffered_write_syncer_test.go rename to log/zap/buffered_write_syncer_test.go diff --git a/pkg/log/zap/core.go b/log/zap/core.go similarity index 91% rename from pkg/log/zap/core.go rename to log/zap/core.go index cf925e92540206f9a7e492609db6c970aee3704b..f2b220eab78a6cd2416408385b521c743bcefb94 100644 --- a/pkg/log/zap/core.go +++ b/log/zap/core.go @@ -1,8 +1,9 @@ package zap import ( + oid "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/log" "git.perx.ru/perxis/perxis-go/pkg/id" - "git.perx.ru/perxis/perxis-go/pkg/log" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -71,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.Object, _ = enc.Fields["object"].(string) - ent.Caller, _ = enc.Fields["caller"].(string) + 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/pkg/log/zap/core_test.go b/log/zap/core_test.go similarity index 91% rename from pkg/log/zap/core_test.go rename to log/zap/core_test.go index 8378658e71b5217cfd5f19c8b905462d5be05c5d..4147dc3e891eff88922d7f473f76f6e846acf13f 100644 --- a/pkg/log/zap/core_test.go +++ b/log/zap/core_test.go @@ -3,7 +3,7 @@ package zap import ( "testing" - "git.perx.ru/perxis/perxis-go/pkg/log" + "git.perx.ru/perxis/perxis-go/log" "github.com/stretchr/testify/require" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -44,8 +44,8 @@ func TestCore_getEntry(t *testing.T) { Category: "create", Component: "Items.Service", Event: "Items.Create", - Object: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl", - Caller: "/users/PHVz", + ObjectID: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl", + CallerID: "/users/PHVz", Attr: "any", Tags: []string{"tag1", "tag2", "tag3"}, }, diff --git a/pkg/log/zap/example_test.go b/log/zap/example_test.go similarity index 90% rename from pkg/log/zap/example_test.go rename to log/zap/example_test.go index 3b0d81d9a8fb3088636f9ddeaf3defcebe05fe3f..a8918b6b2e782e298a5d2537ff691014a9e51ad2 100644 --- a/pkg/log/zap/example_test.go +++ b/log/zap/example_test.go @@ -6,10 +6,10 @@ import ( "slices" "testing" + "git.perx.ru/perxis/perxis-go/log" + logmocks "git.perx.ru/perxis/perxis-go/log/mocks" "git.perx.ru/perxis/perxis-go/pkg/auth" "git.perx.ru/perxis/perxis-go/pkg/items" - "git.perx.ru/perxis/perxis-go/pkg/log" - logmocks "git.perx.ru/perxis/perxis-go/pkg/log/mocks" "git.perx.ru/perxis/perxis-go/pkg/users" usersmocks "git.perx.ru/perxis/perxis-go/pkg/users/mocks" "github.com/stretchr/testify/mock" @@ -25,8 +25,8 @@ func TestExample(t *testing.T) { Message: "Successfully created", Component: "Items", Event: items.EventCreateItem, - Object: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl", - Caller: "/users/294de355", + ObjectID: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl", + CallerID: "/users/294de355", Tags: []string{"tag1", "tag2", "tag3"}, }, { @@ -34,8 +34,8 @@ func TestExample(t *testing.T) { Message: "Successfully updated", Component: "Items", Event: items.EventUpdateItem, - Object: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/cmV2cw", - Caller: "/users/294de355", + ObjectID: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/cmV2cw", + CallerID: "/users/294de355", Attr: map[string]map[string]any{"title": {"old": "old title", "new": "new title"}}, }, } diff --git a/pkg/log/zap/field.go b/log/zap/field.go similarity index 100% rename from pkg/log/zap/field.go rename to log/zap/field.go