update field
This commit is contained in:
@@ -6,6 +6,7 @@ import (
|
||||
"github.com/sirupsen/logrus"
|
||||
"gitoa.ru/go-4devs/log"
|
||||
"gitoa.ru/go-4devs/log/entry"
|
||||
"gitoa.ru/go-4devs/log/field"
|
||||
"gitoa.ru/go-4devs/log/level"
|
||||
)
|
||||
|
||||
@@ -18,9 +19,11 @@ func Standard() log.Logger {
|
||||
func New(log *logrus.Logger) log.Logger {
|
||||
return func(ctx context.Context, data *entry.Entry) (int, error) {
|
||||
lrgFields := make(logrus.Fields, data.Fields().Len())
|
||||
for _, field := range data.Fields() {
|
||||
lrgFields[string(field.Key())] = field.AsInterface()
|
||||
}
|
||||
data.Fields().Fields(func(f field.Field) bool {
|
||||
lrgFields[f.Key] = f.Value.Any()
|
||||
|
||||
return true
|
||||
})
|
||||
|
||||
entry := log.WithContext(ctx).WithFields(lrgFields)
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
|
||||
"gitoa.ru/go-4devs/log/entry"
|
||||
"gitoa.ru/go-4devs/log/field"
|
||||
"gitoa.ru/go-4devs/log/level"
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
@@ -48,9 +49,11 @@ func addEvent(ctx context.Context, data *entry.Entry) {
|
||||
attribute.Int(fieldSeverityNumber, int(lvl)),
|
||||
)
|
||||
|
||||
for _, field := range data.Fields() {
|
||||
attrs = append(attrs, attribute.String(string(field.Key()), field.Value().String()))
|
||||
}
|
||||
data.Fields().Fields(func(f field.Field) bool {
|
||||
attrs = append(attrs, attribute.String(f.Key, f.Value.String()))
|
||||
|
||||
return true
|
||||
})
|
||||
|
||||
span.AddEvent(data.Message(), trace.WithAttributes(attrs...))
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
|
||||
"gitoa.ru/go-4devs/log"
|
||||
"gitoa.ru/go-4devs/log/entry"
|
||||
"gitoa.ru/go-4devs/log/field"
|
||||
"gitoa.ru/go-4devs/log/level"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
@@ -38,10 +39,12 @@ func Development(options ...zap.Option) log.Logger {
|
||||
// New create handler by zap logger.
|
||||
func New(logger *zap.Logger) log.Logger {
|
||||
return func(ctx context.Context, data *entry.Entry) (int, error) {
|
||||
zf := make([]zap.Field, data.Fields().Len())
|
||||
for i, field := range data.Fields() {
|
||||
zf[i] = zap.Any(string(field.Key()), field.AsInterface())
|
||||
}
|
||||
zf := make([]zap.Field, 0, data.Fields().Len())
|
||||
data.Fields().Fields(func(f field.Field) bool {
|
||||
zf = append(zf, zap.Any(f.Key, f.Value.Any()))
|
||||
|
||||
return true
|
||||
})
|
||||
|
||||
switch data.Level() {
|
||||
case level.Emergency:
|
||||
|
||||
Reference in New Issue
Block a user