diff --git a/assets/templates/middleware/log.tmpl b/assets/templates/middleware/log.tmpl index ab91909fb61f1044fe74810390a64d469a6cb614..10066fbe69dda8db64ac02ceeb73d814fc5fd2ca 100644 --- a/assets/templates/middleware/log.tmpl +++ b/assets/templates/middleware/log.tmpl @@ -35,7 +35,7 @@ func {{ $funcName }} (logger *zap.Logger) Middleware { return func(next {{ .Interface.Type }}) {{ .Interface.Type }} { return &{{ $decorator }}{ next: next, - logger: logger.With(logzap.Component("{{ (lower $serviceName ) }}")), + logger: logger.With(logzap.Component("{{ $serviceName }}")), } } } diff --git a/id/organization.go b/id/organization.go index 5aedfb709ef6ff5bde9fd7f06bcba49f07fbd643..a3a9d7e8031d467e6594bc8f7629fba2bec7220c 100644 --- a/id/organization.go +++ b/id/organization.go @@ -35,13 +35,13 @@ func (id *OrganizationId) FromParts(parts []string) error { func (id *OrganizationId) Map() map[string]any { return map[string]any{ - "organization_id": id.OrganizationID, - "type": id.Type(), + "org_id": id.OrganizationID, + "type": id.Type(), } } func (id *OrganizationId) FromMap(m map[string]any) error { - id.OrganizationID, _ = m["organization_id"].(string) + id.OrganizationID, _ = m["org_id"].(string) if id.OrganizationID == "" { return fmt.Errorf("%w: OrganizationId required", ErrInvalidID) } diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go index f97e50e49068173b5aa1968de33abc4d8a44817b..ec2cd931d54b47696b9b3a4d76218e27448f3c64 100644 --- a/id/test/object_id_test.go +++ b/id/test/object_id_test.go @@ -38,7 +38,7 @@ func Test_OrganizationId(t *testing.T) { }, { name: "valid map", - in: map[string]any{"type": "organization", "organization_id": "<org_id>"}, + in: map[string]any{"type": "organization", "org_id": "<org_id>"}, out: "/orgs/<org_id>", result: &id.ObjectId{Descriptor: &id.OrganizationId{OrganizationID: "<org_id>"}}, }, diff --git a/logs/log.go b/logs/log.go index 2bc9dedf82c450e54d46363fbe63eceb44b1a50d..4277ce8a211e02a56229ca93b5489e69c1ec5c83 100644 --- a/logs/log.go +++ b/logs/log.go @@ -29,7 +29,7 @@ func (l Level) String() string { type Entry struct { ID string `json:"id" bson:"id" mapstructure:"id"` Timestamp time.Time `json:"timestamp,omitempty" bson:"timestamp,omitempty" mapstructure:"timestamp,omitempty"` - LogLevel Level `json:"log_level,omitempty" bson:"log_level,omitempty" mapstructure:"log_level,omitempty"` + Level Level `json:"level,omitempty" bson:"level,omitempty" mapstructure:"level,omitempty"` Message string `json:"message,omitempty" bson:"message,omitempty" mapstructure:"message,omitempty"` Category string `json:"category,omitempty" bson:"category,omitempty" mapstructure:"category,omitempty"` Component string `json:"component,omitempty" bson:"component,omitempty" mapstructure:"component,omitempty"` @@ -54,7 +54,7 @@ func EntryToPB(entry *Entry) *pb.LogEntry { logEntry := &pb.LogEntry{ Id: entry.ID, Timestamp: timestamppb.New(entry.Timestamp), - Level: pb.LogLevel(entry.LogLevel), + Level: pb.LogLevel(entry.Level), Message: entry.Message, Category: entry.Category, Component: entry.Component, @@ -76,7 +76,7 @@ func EntryFromPB(request *pb.LogEntry) *Entry { logEntry := &Entry{ ID: request.Id, Timestamp: request.Timestamp.AsTime(), - LogLevel: Level(request.Level), + Level: Level(request.Level), Message: request.Message, Category: request.Category, Component: request.Component, @@ -103,7 +103,7 @@ func (e *Entry) ToMap() map[string]any { res := map[string]any{ "id": e.ID, "timestamp": e.Timestamp, - "log_level": e.LogLevel, + "level": e.Level, "message": e.Message, "category": e.Category, "component": e.Component, diff --git a/logs/log_test.go b/logs/log_test.go index 9ccb7e7065cccf5b3945339b6085a108e6b0fae2..1816cb9ff8e9222784623acd87593c6ef0bb3acf 100644 --- a/logs/log_test.go +++ b/logs/log_test.go @@ -42,7 +42,7 @@ func TestEntry_ToMap(t *testing.T) { nil, nil, }, - map[string]interface{}{"caller": map[string]interface{}{"type": "user", "user_id": "<user_id>"}, "caller_id": "/users/<user_id>", "category": "", "component": "", "event": "", "id": "1", "log_level": Level(0), "message": "message", "object": map[string]interface{}{"env_id": "<env_id>", "space_id": "<space_id>", "type": "environment"}, "object_id": "/spaces/<space_id>/envs/<env_id>", "timestamp": time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)}, + map[string]interface{}{"caller": map[string]interface{}{"type": "user", "user_id": "<user_id>"}, "caller_id": "/users/<user_id>", "category": "", "component": "", "event": "", "id": "1", "level": Level(0), "message": "message", "object": map[string]interface{}{"env_id": "<env_id>", "space_id": "<space_id>", "type": "environment"}, "object_id": "/spaces/<space_id>/envs/<env_id>", "timestamp": time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)}, }, } for _, tt := range tests { @@ -50,7 +50,7 @@ func TestEntry_ToMap(t *testing.T) { e := &Entry{ ID: tt.fields.ID, Timestamp: tt.fields.Timestamp, - LogLevel: tt.fields.LogLevel, + Level: tt.fields.LogLevel, Message: tt.fields.Message, Category: tt.fields.Category, Component: tt.fields.Component, diff --git a/logs/zap/core.go b/logs/zap/core.go index 3b0c3305f685f8dfe52628dd49c1d4716fda9e91..482cb8594c23f781344df4e8e4b7a22e9f67a466 100644 --- a/logs/zap/core.go +++ b/logs/zap/core.go @@ -67,7 +67,7 @@ func (core *Core) getEntry(entry zapcore.Entry, fields []zapcore.Field) *logs.En ent := &logs.Entry{ ID: id.GenerateNewID(), Timestamp: entry.Time, - LogLevel: logs.Level(entry.Level), + Level: logs.Level(entry.Level), Message: entry.Message, } diff --git a/logs/zap/core_test.go b/logs/zap/core_test.go index aabe9cea3da3f4eb4da1d0696c7c6fb08753cc63..360e850a410b321239e948b6c35d08e1a397ab45 100644 --- a/logs/zap/core_test.go +++ b/logs/zap/core_test.go @@ -41,7 +41,7 @@ func TestCore_getEntry(t *testing.T) { }, }, want: &logs.Entry{ - LogLevel: logs.Level(zapcore.InfoLevel), + Level: logs.Level(zapcore.InfoLevel), Message: "создан элемент коллекции", Category: "create", Component: "Items.Service", diff --git a/logs/zap/example_test.go b/logs/zap/example_test.go index 9dfd0aaa2f33820c72bffcdd6ecae965672ad838..e0db8954ffa3346acf55446342fb3bc80fca2e98 100644 --- a/logs/zap/example_test.go +++ b/logs/zap/example_test.go @@ -26,7 +26,7 @@ func TestExample(t *testing.T) { wantEntries := []*logs.Entry{ { - LogLevel: logs.Level(zapcore.InfoLevel), + Level: logs.Level(zapcore.InfoLevel), Message: "Successfully created", Component: "Items", Event: items.EventCreateItem, @@ -35,7 +35,7 @@ func TestExample(t *testing.T) { Tags: []string{"tag1", "tag2", "tag3"}, }, { - LogLevel: logs.Level(zapcore.WarnLevel), + Level: logs.Level(zapcore.WarnLevel), Message: "Successfully updated", Component: "Items", Event: items.EventUpdateItem, diff --git a/pkg/collections/middleware/logging_middleware.go b/pkg/collections/middleware/logging_middleware.go index bf04a4aac6e1f5304e982dac0b6c77662715a1cc..fb12be9fa3a0b7e05603cc418b5ec7505048a7f9 100644 --- a/pkg/collections/middleware/logging_middleware.go +++ b/pkg/collections/middleware/logging_middleware.go @@ -19,7 +19,7 @@ func LoggingMiddleware(logger *zap.Logger) Middleware { return func(next collections.Collections) collections.Collections { return &loggingMiddleware{ next: next, - logger: logger.With(logzap.Component("collections")), + logger: logger.With(logzap.Component("Collections")), } } } diff --git a/pkg/items/middleware/logging_middleware.go b/pkg/items/middleware/logging_middleware.go index fe7870a831d9b90a6145ad20f4c55cb602e8ed98..e2829a4261b42dbbc8ce7a52bcdcf0d3dd21ff05 100644 --- a/pkg/items/middleware/logging_middleware.go +++ b/pkg/items/middleware/logging_middleware.go @@ -19,7 +19,7 @@ func LoggingMiddleware(logger *zap.Logger) Middleware { return func(next items.Items) items.Items { return &loggingMiddleware{ next: next, - logger: logger.With(logzap.Component("items")), + logger: logger.With(logzap.Component("Items")), } } }