diff --git a/logs/log.go b/logs/log.go index 2bc9dedf82c450e54d46363fbe63eceb44b1a50d..407cfbdbeb9b5a186842fc2b6ba740e5ac588760 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, + "log_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..3e86d4a8890747c2178c5610e3b7f48a514abd69 100644 --- a/logs/log_test.go +++ b/logs/log_test.go @@ -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,