From 4a787dd2c35f7b0e36527477cb6ae34481637664 Mon Sep 17 00:00:00 2001 From: Evstigneev Denis Date: Fri, 11 Oct 2024 15:54:46 +0300 Subject: [PATCH] refactor micro && logger interface && upate printlogs --- broker/memory/memory.go | 5 +- config/config.go | 13 +- flow/default.go | 28 +-- fsm/fsm_test.go | 2 +- logger/logger.go | 140 +------------- logger/noop.go | 14 +- logger/slog/slog.go | 319 +++----------------------------- logger/slog/slog_test.go | 2 +- network/tunnel/broker/broker.go | 16 +- register/memory/memory.go | 15 +- server/noop.go | 2 +- service.go | 4 +- tracer/memory/memory_test.go | 4 +- util/id/id.go | 2 +- 14 files changed, 86 insertions(+), 480 deletions(-) diff --git a/broker/memory/memory.go b/broker/memory/memory.go index 9fa1551c..a2cce27c 100644 --- a/broker/memory/memory.go +++ b/broker/memory/memory.go @@ -2,6 +2,7 @@ package broker import ( "context" + "fmt" "sync" "go.unistack.org/micro/v3/broker" @@ -206,7 +207,7 @@ func (m *memoryBroker) publish(ctx context.Context, msgs []*broker.Message, opts } } else if sub.opts.AutoAck { if err = ms.Ack(); err != nil { - m.opts.Logger.Errorf(m.opts.Context, "ack failed: %v", err) + m.opts.Logger.Error(m.opts.Context, fmt.Sprintf("ack failed: %v", err), err) } } // single processing @@ -221,7 +222,7 @@ func (m *memoryBroker) publish(ctx context.Context, msgs []*broker.Message, opts } } else if sub.opts.AutoAck { if err = p.Ack(); err != nil { - m.opts.Logger.Errorf(m.opts.Context, "ack failed: %v", err) + m.opts.Logger.Error(m.opts.Context, fmt.Sprintf("ack failed: %v", err), err) } } } diff --git a/config/config.go b/config/config.go index aa8ff16f..ac1a30c8 100644 --- a/config/config.go +++ b/config/config.go @@ -4,6 +4,7 @@ package config import ( "context" "errors" + "fmt" "reflect" "time" ) @@ -138,7 +139,7 @@ var ( return nil } if err := fn(ctx, c); err != nil { - c.Options().Logger.Errorf(ctx, "%s BeforeLoad err: %v", c.String(), err) + c.Options().Logger.Error(ctx, fmt.Sprintf("%s BeforeLoad err: %v", c.String(), err), err) if !c.Options().AllowFail { return err } @@ -153,7 +154,7 @@ var ( return nil } if err := fn(ctx, c); err != nil { - c.Options().Logger.Errorf(ctx, "%s AfterLoad err: %v", c.String(), err) + c.Options().Logger.Error(ctx, fmt.Sprintf("%s AfterLoad err: %v", c.String(), err), err) if !c.Options().AllowFail { return err } @@ -168,7 +169,7 @@ var ( return nil } if err := fn(ctx, c); err != nil { - c.Options().Logger.Errorf(ctx, "%s BeforeSave err: %v", c.String(), err) + c.Options().Logger.Error(ctx, fmt.Sprintf("%s BeforeSave err: %v", c.String(), err), err) if !c.Options().AllowFail { return err } @@ -183,7 +184,7 @@ var ( return nil } if err := fn(ctx, c); err != nil { - c.Options().Logger.Errorf(ctx, "%s AfterSave err: %v", c.String(), err) + c.Options().Logger.Error(ctx, fmt.Sprintf("%s AfterSave err: %v", c.String(), err), err) if !c.Options().AllowFail { return err } @@ -198,7 +199,7 @@ var ( return nil } if err := fn(ctx, c); err != nil { - c.Options().Logger.Errorf(ctx, "%s BeforeInit err: %v", c.String(), err) + c.Options().Logger.Error(ctx, fmt.Sprintf("%s BeforeInit err: %v", c.String(), err), err) if !c.Options().AllowFail { return err } @@ -213,7 +214,7 @@ var ( return nil } if err := fn(ctx, c); err != nil { - c.Options().Logger.Errorf(ctx, "%s AfterInit err: %v", c.String(), err) + c.Options().Logger.Error(ctx, fmt.Sprintf("%s AfterInit err: %v", c.String(), err), err) if !c.Options().AllowFail { return err } diff --git a/flow/default.go b/flow/default.go index af0e018a..f8cc7f04 100644 --- a/flow/default.go +++ b/flow/default.go @@ -188,7 +188,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu steps, err := w.getSteps(options.Start, options.Reverse) if err != nil { if werr := workflowStore.Write(w.opts.Context, "status", &codec.Frame{Data: []byte(StatusPending.String())}); werr != nil { - w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr) + w.opts.Logger.Error(w.opts.Context, fmt.Sprintf("store error: %v", werr), werr) } return "", err } @@ -212,7 +212,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu done := make(chan struct{}) if werr := workflowStore.Write(w.opts.Context, "status", &codec.Frame{Data: []byte(StatusRunning.String())}); werr != nil { - w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr) + w.opts.Logger.Error(w.opts.Context, fmt.Sprintf("store error: %v", werr), werr) return eid, werr } for idx := range steps { @@ -237,7 +237,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu return } if w.opts.Logger.V(logger.TraceLevel) { - w.opts.Logger.Tracef(nctx, "will be executed %v", steps[idx][nidx]) + w.opts.Logger.Trace(nctx, fmt.Sprintf("will be executed %v", steps[idx][nidx])) } cstep := steps[idx][nidx] // nolint: nestif @@ -257,21 +257,21 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu if serr != nil { step.SetStatus(StatusFailure) if werr := stepStore.Write(ctx, step.ID()+w.opts.Store.Options().Separator+"rsp", serr); werr != nil && w.opts.Logger.V(logger.ErrorLevel) { - w.opts.Logger.Errorf(ctx, "store write error: %v", werr) + w.opts.Logger.Error(ctx, fmt.Sprintf("store write error: %v", werr), werr) } if werr := stepStore.Write(ctx, step.ID()+w.opts.Store.Options().Separator+"status", &codec.Frame{Data: []byte(StatusFailure.String())}); werr != nil && w.opts.Logger.V(logger.ErrorLevel) { - w.opts.Logger.Errorf(ctx, "store write error: %v", werr) + w.opts.Logger.Error(ctx, fmt.Sprintf("store write error: %v", werr), werr) } cherr <- serr return } if werr := stepStore.Write(ctx, step.ID()+w.opts.Store.Options().Separator+"rsp", rsp); werr != nil { - w.opts.Logger.Errorf(ctx, "store write error: %v", werr) + w.opts.Logger.Error(ctx, fmt.Sprintf("store write error: %v", werr), werr) cherr <- werr return } if werr := stepStore.Write(ctx, step.ID()+w.opts.Store.Options().Separator+"status", &codec.Frame{Data: []byte(StatusSuccess.String())}); werr != nil { - w.opts.Logger.Errorf(ctx, "store write error: %v", werr) + w.opts.Logger.Error(ctx, fmt.Sprintf("store write error: %v", werr), werr) cherr <- werr return } @@ -290,16 +290,16 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu if serr != nil { cstep.SetStatus(StatusFailure) if werr := stepStore.Write(ctx, cstep.ID()+w.opts.Store.Options().Separator+"rsp", serr); werr != nil && w.opts.Logger.V(logger.ErrorLevel) { - w.opts.Logger.Errorf(ctx, "store write error: %v", werr) + w.opts.Logger.Error(ctx, fmt.Sprintf("store write error: %v", werr), werr) } if werr := stepStore.Write(ctx, cstep.ID()+w.opts.Store.Options().Separator+"status", &codec.Frame{Data: []byte(StatusFailure.String())}); werr != nil && w.opts.Logger.V(logger.ErrorLevel) { - w.opts.Logger.Errorf(ctx, "store write error: %v", werr) + w.opts.Logger.Error(ctx, fmt.Sprintf("store write error: %v", werr), werr) } cherr <- serr return } if werr := stepStore.Write(ctx, cstep.ID()+w.opts.Store.Options().Separator+"rsp", rsp); werr != nil { - w.opts.Logger.Errorf(ctx, "store write error: %v", werr) + w.opts.Logger.Error(ctx, fmt.Sprintf("store write error: %v", werr), werr) cherr <- werr return } @@ -317,7 +317,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu return eid, nil } - logger.Tracef(ctx, "wait for finish or error") + logger.DefaultLogger.Trace(ctx, "wait for finish or error") select { case <-nctx.Done(): err = nctx.Err() @@ -333,15 +333,15 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu switch { case nctx.Err() != nil: if werr := workflowStore.Write(w.opts.Context, "status", &codec.Frame{Data: []byte(StatusAborted.String())}); werr != nil { - w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr) + w.opts.Logger.Error(w.opts.Context, fmt.Sprintf("store error: %v", werr), werr) } case err == nil: if werr := workflowStore.Write(w.opts.Context, "status", &codec.Frame{Data: []byte(StatusSuccess.String())}); werr != nil { - w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr) + w.opts.Logger.Error(w.opts.Context, fmt.Sprintf("store error: %v", werr), werr) } case err != nil: if werr := workflowStore.Write(w.opts.Context, "status", &codec.Frame{Data: []byte(StatusFailure.String())}); werr != nil { - w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr) + w.opts.Logger.Error(w.opts.Context, fmt.Sprintf("store error: %v", werr), werr) } } diff --git a/fsm/fsm_test.go b/fsm/fsm_test.go index ad7d706e..d39920c8 100644 --- a/fsm/fsm_test.go +++ b/fsm/fsm_test.go @@ -17,7 +17,7 @@ func TestFSMStart(t *testing.T) { wrapper := func(next StateFunc) StateFunc { return func(sctx context.Context, s State, opts ...StateOption) (State, error) { - sctx = logger.NewContext(sctx, logger.Fields("state", s.Name())) + sctx = logger.NewContext(sctx, logger.DefaultLogger.Fields("state", s.Name())) return next(sctx, s, opts...) } } diff --git a/logger/logger.go b/logger/logger.go index aac0734c..33622533 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -31,40 +31,19 @@ type Logger interface { // Fields set fields to always be logged with keyval pairs Fields(fields ...interface{}) Logger // Info level message - Info(ctx context.Context, args ...interface{}) + Info(ctx context.Context, msg string, args ...interface{}) // Trace level message - Trace(ctx context.Context, args ...interface{}) + Trace(ctx context.Context, msg string, args ...interface{}) // Debug level message - Debug(ctx context.Context, args ...interface{}) + Debug(ctx context.Context, msg string, args ...interface{}) // Warn level message - Warn(ctx context.Context, args ...interface{}) + Warn(ctx context.Context, msg string, args ...interface{}) // Error level message - Error(ctx context.Context, args ...interface{}) + Error(ctx context.Context, msg string, args ...interface{}) // Fatal level message - Fatal(ctx context.Context, args ...interface{}) - // Infof level message - // DEPRECATED - Infof(ctx context.Context, msg string, args ...interface{}) - // Tracef level message - // DEPRECATED - Tracef(ctx context.Context, msg string, args ...interface{}) - // Debugf level message - // DEPRECATED - Debugf(ctx context.Context, msg string, args ...interface{}) - // Warnf level message - // DEPRECATED - Warnf(ctx context.Context, msg string, args ...interface{}) - // Errorf level message - // DEPRECATED - Errorf(ctx context.Context, msg string, args ...interface{}) - // Fatalf level message - // DEPRECATED - Fatalf(ctx context.Context, msg string, args ...interface{}) + Fatal(ctx context.Context, msg string, args ...interface{}) // Log logs message with needed level - Log(ctx context.Context, level Level, args ...interface{}) - // Logf logs message with needed level - // DEPRECATED - Logf(ctx context.Context, level Level, msg string, args ...interface{}) + Log(ctx context.Context, level Level, msg string, args ...interface{}) // Name returns broker instance name Name() string // String returns the type of logger @@ -73,108 +52,3 @@ type Logger interface { // Field contains keyval pair type Field interface{} - -// Info writes msg to default logger on info level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Info(ctx context.Context, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Info(ctx, args...) -} - -// Error writes msg to default logger on error level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Error(ctx context.Context, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Error(ctx, args...) -} - -// Debug writes msg to default logger on debug level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Debug(ctx context.Context, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Debug(ctx, args...) -} - -// Warn writes msg to default logger on warn level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Warn(ctx context.Context, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Warn(ctx, args...) -} - -// Trace writes msg to default logger on trace level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Trace(ctx context.Context, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Trace(ctx, args...) -} - -// Fatal writes msg to default logger on fatal level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Fatal(ctx context.Context, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Fatal(ctx, args...) -} - -// Infof writes formatted msg to default logger on info level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Infof(ctx context.Context, msg string, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Infof(ctx, msg, args...) -} - -// Errorf writes formatted msg to default logger on error level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Errorf(ctx context.Context, msg string, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Errorf(ctx, msg, args...) -} - -// Debugf writes formatted msg to default logger on debug level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Debugf(ctx context.Context, msg string, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Debugf(ctx, msg, args...) -} - -// Warnf writes formatted msg to default logger on warn level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Warnf(ctx context.Context, msg string, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Warnf(ctx, msg, args...) -} - -// Tracef writes formatted msg to default logger on trace level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Tracef(ctx context.Context, msg string, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Tracef(ctx, msg, args...) -} - -// Fatalf writes formatted msg to default logger on fatal level -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Fatalf(ctx context.Context, msg string, args ...interface{}) { - DefaultLogger.Clone(WithCallerSkipCount(DefaultCallerSkipCount+1)).Fatalf(ctx, msg, args...) -} - -// V returns true if passed level enabled in default logger -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func V(level Level) bool { - return DefaultLogger.V(level) -} - -// Init initialize logger -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Init(opts ...Option) error { - return DefaultLogger.Init(opts...) -} - -// Fields create logger with specific fields -// -// Deprecated: Dont use logger methods directly, use instance of logger to avoid additional allocations -func Fields(fields ...interface{}) Logger { - return DefaultLogger.Fields(fields...) -} diff --git a/logger/noop.go b/logger/noop.go index 17f3608b..5d95e9b2 100644 --- a/logger/noop.go +++ b/logger/noop.go @@ -51,25 +51,25 @@ func (l *noopLogger) String() string { return "noop" } -func (l *noopLogger) Log(ctx context.Context, lvl Level, attrs ...interface{}) { +func (l *noopLogger) Log(ctx context.Context, lvl Level, msg string, attrs ...interface{}) { } -func (l *noopLogger) Info(ctx context.Context, attrs ...interface{}) { +func (l *noopLogger) Info(ctx context.Context, msg string, attrs ...interface{}) { } -func (l *noopLogger) Debug(ctx context.Context, attrs ...interface{}) { +func (l *noopLogger) Debug(ctx context.Context, msg string, attrs ...interface{}) { } -func (l *noopLogger) Error(ctx context.Context, attrs ...interface{}) { +func (l *noopLogger) Error(ctx context.Context, msg string, attrs ...interface{}) { } -func (l *noopLogger) Trace(ctx context.Context, attrs ...interface{}) { +func (l *noopLogger) Trace(ctx context.Context, msg string, attrs ...interface{}) { } -func (l *noopLogger) Warn(ctx context.Context, attrs ...interface{}) { +func (l *noopLogger) Warn(ctx context.Context, msg string, attrs ...interface{}) { } -func (l *noopLogger) Fatal(ctx context.Context, attrs ...interface{}) { +func (l *noopLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}) { } func (l *noopLogger) Logf(ctx context.Context, lvl Level, msg string, attrs ...interface{}) { diff --git a/logger/slog/slog.go b/logger/slog/slog.go index b2260a58..1f617e46 100644 --- a/logger/slog/slog.go +++ b/logger/slog/slog.go @@ -2,7 +2,6 @@ package slog import ( "context" - "fmt" "log/slog" "os" "regexp" @@ -157,231 +156,33 @@ func (s *slogLogger) Init(opts ...logger.Option) error { return nil } -func (s *slogLogger) Log(ctx context.Context, lvl logger.Level, attrs ...interface{}) { - s.printLog(ctx, lvl, attrs...) +func (s *slogLogger) Log(ctx context.Context, lvl logger.Level, msg string, attrs ...interface{}) { + s.printLog(ctx, lvl, msg, attrs...) } -// Logf DEPRECATED -func (s *slogLogger) Logf(ctx context.Context, lvl logger.Level, msg string, attrs ...interface{}) { - s.opts.Meter.Counter(semconv.LoggerMessageTotal, "level", lvl.String()).Inc() - if !s.V(lvl) || len(attrs) == 0 { - return - } - var pcs [1]uintptr - runtime.Callers(2, pcs[:]) // skip [Callers, Logf] - r := slog.NewRecord(s.opts.TimeFunc(), loggerToSlogLevel(lvl), msg, pcs[0]) - for _, fn := range s.opts.ContextAttrFuncs { - attrs = append(attrs, fn(ctx)...) - } - - for idx, attr := range attrs { - if ve, ok := attr.(error); ok && ve != nil { - attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error()) - break - } - } - if s.opts.AddStacktrace && lvl == logger.ErrorLevel { - stackInfo := make([]byte, 1024*1024) - if stackSize := runtime.Stack(stackInfo, false); stackSize > 0 { - traceLines := reTrace.Split(string(stackInfo[:stackSize]), -1) - if len(traceLines) != 0 { - attrs = append(attrs, (slog.String(s.opts.StacktraceKey, traceLines[len(traceLines)-1]))) - } - } - } - r.Add(attrs[1:]...) - r.Attrs(func(a slog.Attr) bool { - if a.Key == s.opts.ErrorKey { - if span, ok := tracer.SpanFromContext(ctx); ok { - span.SetStatus(tracer.SpanStatusError, a.Value.String()) - return false - } - } - return true - }) - _ = s.handler.Handle(ctx, r) +func (s *slogLogger) Info(ctx context.Context, msg string, attrs ...interface{}) { + s.printLog(ctx, logger.InfoLevel, msg, attrs...) } -func (s *slogLogger) Info(ctx context.Context, attrs ...interface{}) { - s.printLog(ctx, logger.InfoLevel, attrs...) +func (s *slogLogger) Debug(ctx context.Context, msg string, attrs ...interface{}) { + s.printLog(ctx, logger.DebugLevel, msg, attrs...) } -// Infof DEPRECATED -func (s *slogLogger) Infof(ctx context.Context, msg string, attrs ...interface{}) { - s.opts.Meter.Counter(semconv.LoggerMessageTotal, "level", logger.InfoLevel.String()).Inc() - if !s.V(logger.InfoLevel) || len(attrs) == 0 { - return - } - var pcs [1]uintptr - runtime.Callers(2, pcs[:]) // skip [Callers, Infof] - r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelInfo, msg, pcs[0]) - for _, fn := range s.opts.ContextAttrFuncs { - attrs = append(attrs, fn(ctx)...) - } - - for idx, attr := range attrs { - if ve, ok := attr.(error); ok && ve != nil { - attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error()) - break - } - } - r.Add(attrs...) - _ = s.handler.Handle(ctx, r) +func (s *slogLogger) Trace(ctx context.Context, msg string, attrs ...interface{}) { + s.printLog(ctx, logger.TraceLevel, msg, attrs...) } -func (s *slogLogger) Debug(ctx context.Context, attrs ...interface{}) { - s.printLog(ctx, logger.DebugLevel, attrs...) +func (s *slogLogger) Error(ctx context.Context, msg string, attrs ...interface{}) { + s.printLog(ctx, logger.ErrorLevel, msg, attrs...) } -// Debugf DEPRECATED -func (s *slogLogger) Debugf(ctx context.Context, msg string, attrs ...interface{}) { - s.opts.Meter.Counter(semconv.LoggerMessageTotal, "level", logger.DebugLevel.String()).Inc() - if !s.V(logger.DebugLevel) || len(attrs) == 0 { - return - } - var pcs [1]uintptr - runtime.Callers(2, pcs[:]) // skip [Callers, Debugf] - r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelDebug, msg, pcs[0]) - for _, fn := range s.opts.ContextAttrFuncs { - attrs = append(attrs, fn(ctx)...) - } - - for idx, attr := range attrs { - if ve, ok := attr.(error); ok && ve != nil { - attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error()) - break - } - } - r.Add(attrs...) - _ = s.handler.Handle(ctx, r) -} - -func (s *slogLogger) Trace(ctx context.Context, attrs ...interface{}) { - s.printLog(ctx, logger.TraceLevel, attrs...) -} - -// Tracef DEPRECATED -func (s *slogLogger) Tracef(ctx context.Context, msg string, attrs ...interface{}) { - s.opts.Meter.Counter(semconv.LoggerMessageTotal, "level", logger.TraceLevel.String()).Inc() - if !s.V(logger.TraceLevel) || len(attrs) == 0 { - return - } - var pcs [1]uintptr - runtime.Callers(2, pcs[:]) // skip [Callers, Tracef] - r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelDebug-1, msg, pcs[0]) - for _, fn := range s.opts.ContextAttrFuncs { - attrs = append(attrs, fn(ctx)...) - } - - for idx, attr := range attrs { - if ve, ok := attr.(error); ok && ve != nil { - attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error()) - break - } - } - r.Add(attrs[1:]...) - _ = s.handler.Handle(ctx, r) -} - -func (s *slogLogger) Error(ctx context.Context, attrs ...interface{}) { - s.printLog(ctx, logger.ErrorLevel, attrs...) -} - -// Errorf DEPRECATED -func (s *slogLogger) Errorf(ctx context.Context, msg string, attrs ...interface{}) { - s.opts.Meter.Counter(semconv.LoggerMessageTotal, "level", logger.ErrorLevel.String()).Inc() - if !s.V(logger.ErrorLevel) || len(attrs) == 0 { - return - } - var pcs [1]uintptr - runtime.Callers(2, pcs[:]) // skip [Callers, Errorf] - r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelError, msg, pcs[0]) - for _, fn := range s.opts.ContextAttrFuncs { - attrs = append(attrs, fn(ctx)...) - } - - for idx, attr := range attrs { - if ve, ok := attr.(error); ok && ve != nil { - attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error()) - break - } - } - if s.opts.AddStacktrace { - stackInfo := make([]byte, 1024*1024) - if stackSize := runtime.Stack(stackInfo, false); stackSize > 0 { - traceLines := reTrace.Split(string(stackInfo[:stackSize]), -1) - if len(traceLines) != 0 { - attrs = append(attrs, slog.String("stacktrace", traceLines[len(traceLines)-1])) - } - } - } - r.Add(attrs...) - r.Attrs(func(a slog.Attr) bool { - if a.Key == s.opts.ErrorKey { - if span, ok := tracer.SpanFromContext(ctx); ok { - span.SetStatus(tracer.SpanStatusError, a.Value.String()) - return false - } - } - return true - }) - _ = s.handler.Handle(ctx, r) -} - -func (s *slogLogger) Fatal(ctx context.Context, attrs ...interface{}) { - s.printLog(ctx, logger.FatalLevel, attrs...) +func (s *slogLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}) { + s.printLog(ctx, logger.FatalLevel, msg, attrs...) os.Exit(1) } -// Fatalf DEPRECATED -func (s *slogLogger) Fatalf(ctx context.Context, msg string, attrs ...interface{}) { - s.opts.Meter.Counter(semconv.LoggerMessageTotal, "level", logger.FatalLevel.String()).Inc() - if !s.V(logger.FatalLevel) || len(attrs) == 0 { - return - } - var pcs [1]uintptr - runtime.Callers(2, pcs[:]) // skip [Callers, Fatalf] - r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelError+1, msg, pcs[0]) - for _, fn := range s.opts.ContextAttrFuncs { - attrs = append(attrs, fn(ctx)...) - } - - for idx, attr := range attrs { - if ve, ok := attr.(error); ok && ve != nil { - attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error()) - break - } - } - r.Add(attrs...) - _ = s.handler.Handle(ctx, r) - os.Exit(1) -} - -func (s *slogLogger) Warn(ctx context.Context, attrs ...interface{}) { - s.printLog(ctx, logger.WarnLevel, attrs...) -} - -// Warnf DEPRECATED -func (s *slogLogger) Warnf(ctx context.Context, msg string, attrs ...interface{}) { - s.opts.Meter.Counter(semconv.LoggerMessageTotal, "level", logger.WarnLevel.String()).Inc() - if !s.V(logger.WarnLevel) || len(attrs) == 0 { - return - } - var pcs [1]uintptr - runtime.Callers(2, pcs[:]) // skip [Callers, Warnf] - r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelWarn, msg, pcs[0]) - for _, fn := range s.opts.ContextAttrFuncs { - attrs = append(attrs, fn(ctx)...) - } - - for idx, attr := range attrs { - if ve, ok := attr.(error); ok && ve != nil { - attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error()) - break - } - } - r.Add(attrs[1:]...) - _ = s.handler.Handle(ctx, r) +func (s *slogLogger) Warn(ctx context.Context, msg string, attrs ...interface{}) { + s.printLog(ctx, logger.WarnLevel, msg, attrs...) } func (s *slogLogger) Name() string { @@ -392,41 +193,26 @@ func (s *slogLogger) String() string { return "slog" } -func (s *slogLogger) printLog(ctx context.Context, lvl logger.Level, attrs ...interface{}) { +func (s *slogLogger) printLog(ctx context.Context, lvl logger.Level, msg string, attrs ...interface{}) { s.opts.Meter.Counter(semconv.LoggerMessageTotal, "level", lvl.String()).Inc() - if !s.V(lvl) || len(attrs) == 0 { + if !s.V(lvl) { return } - msg := attrs[0] - attrs = prepareAttributes(attrs[1:]) - - ve, hasErr := msg.(error) - if hasErr && ve != nil { - attrs = append(attrs, slog.String(s.opts.ErrorKey, ve.Error())) - if span, ok := tracer.SpanFromContext(ctx); ok { - span.SetStatus(tracer.SpanStatusError, ve.Error()) - } - } + attrs = prepareAttributes(attrs) for _, fn := range s.opts.ContextAttrFuncs { a := prepareAttributes(fn(ctx)) attrs = append(attrs, a...) } - if !hasErr { - for idx, attr := range attrs { - if ve, hasErr = attr.(error); hasErr && ve != nil { - if idx%2 == 1 { - attrs = append(attrs, slog.String(s.opts.ErrorKey, ve.Error())) - } else { - attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error()) - } - if span, ok := tracer.SpanFromContext(ctx); ok { - span.SetStatus(tracer.SpanStatusError, ve.Error()) - } - break + for _, attr := range attrs { + if ve, hasErr := attr.(error); hasErr && ve != nil { + attrs = append(attrs, slog.String(s.opts.ErrorKey, ve.Error())) + if span, ok := tracer.SpanFromContext(ctx); ok { + span.SetStatus(tracer.SpanStatusError, ve.Error()) } + break } } @@ -440,66 +226,10 @@ func (s *slogLogger) printLog(ctx context.Context, lvl logger.Level, attrs ...in } } - var pcs [1]uintptr - runtime.Callers(defaultCallerSkipCount, pcs[:]) // skip [Callers, printLog, LogLvlMethod] - r := slog.NewRecord(s.opts.TimeFunc(), loggerToSlogLevel(lvl), fmt.Sprintf("%s", msg), pcs[0]) - r.Add(attrs...) - _ = s.handler.Handle(ctx, r) -} - -func (s *slogLogger) printLogf(ctx context.Context, lvl logger.Level, format string, attrs ...interface{}) { - s.opts.Meter.Counter(semconv.LoggerMessageTotal, "level", lvl.String()).Inc() - if !s.V(lvl) { - return - } - - msg := fmt.Sprintf(format, attrs...) - - var nAttrs []interface{} - for _, fn := range s.opts.ContextAttrFuncs { - a := prepareAttributes(fn(ctx)) - nAttrs = append(nAttrs, a...) - } - - hasErr := false - for _, attr := range attrs { - if ve, ok := attr.(error); ok && ve != nil { - hasErr = true - nAttrs = append(nAttrs, slog.String(s.opts.ErrorKey, ve.Error())) - if span, ok := tracer.SpanFromContext(ctx); ok { - span.SetStatus(tracer.SpanStatusError, ve.Error()) - } - break - } - } - - if !hasErr { - for _, attr := range nAttrs { - if ve, ok := attr.(error); ok && ve != nil { - hasErr = true - nAttrs = append(nAttrs, slog.String(s.opts.ErrorKey, ve.Error())) - if span, ok := tracer.SpanFromContext(ctx); ok { - span.SetStatus(tracer.SpanStatusError, ve.Error()) - } - break - } - } - } - - if s.opts.AddStacktrace && lvl == logger.ErrorLevel { - stackInfo := make([]byte, 1024*1024) - if stackSize := runtime.Stack(stackInfo, false); stackSize > 0 { - traceLines := reTrace.Split(string(stackInfo[:stackSize]), -1) - if len(traceLines) != 0 { - nAttrs = append(nAttrs, slog.String(s.opts.StacktraceKey, traceLines[len(traceLines)-1])) - } - } - } - var pcs [1]uintptr runtime.Callers(defaultCallerSkipCount, pcs[:]) // skip [Callers, printLog, LogLvlMethod] r := slog.NewRecord(s.opts.TimeFunc(), loggerToSlogLevel(lvl), msg, pcs[0]) - r.Add(nAttrs...) + r.Add(attrs...) _ = s.handler.Handle(ctx, r) } @@ -546,7 +276,6 @@ func slogToLoggerLevel(level slog.Level) logger.Level { } func prepareAttributes(attrs []interface{}) []interface{} { - if len(attrs)%2 == 1 { attrs = append(attrs, badKey) attrs[len(attrs)-1], attrs[len(attrs)-2] = attrs[len(attrs)-2], attrs[len(attrs)-1] diff --git a/logger/slog/slog_test.go b/logger/slog/slog_test.go index 8f94d663..f8daace0 100644 --- a/logger/slog/slog_test.go +++ b/logger/slog/slog_test.go @@ -47,7 +47,7 @@ func TestErrorf(t *testing.T) { t.Fatalf("logger BADKEY not works, buf contains: %s", buf.Bytes()) } - l.Log(ctx, logger.ErrorLevel, errors.New("error msg")) + l.Log(ctx, logger.ErrorLevel, "", errors.New("error msg")) if !bytes.Contains(buf.Bytes(), []byte(`"error":"error msg"`)) { t.Fatalf("logger error not works, buf contains: %s", buf.Bytes()) } diff --git a/network/tunnel/broker/broker.go b/network/tunnel/broker/broker.go index 95a2f20f..921d1853 100644 --- a/network/tunnel/broker/broker.go +++ b/network/tunnel/broker/broker.go @@ -177,12 +177,12 @@ func (t *tunBatchSubscriber) run() { // receive message m := new(transport.Message) if err := c.Recv(m); err != nil { - if logger.V(logger.ErrorLevel) { - logger.Error(t.opts.Context, err.Error()) + if logger.DefaultLogger.V(logger.ErrorLevel) { + logger.DefaultLogger.Error(t.opts.Context, err.Error(), err) } if err = c.Close(); err != nil { - if logger.V(logger.ErrorLevel) { - logger.Error(t.opts.Context, err.Error()) + if logger.DefaultLogger.V(logger.ErrorLevel) { + logger.DefaultLogger.Error(t.opts.Context, err.Error(), err) } } continue @@ -222,12 +222,12 @@ func (t *tunSubscriber) run() { // receive message m := new(transport.Message) if err := c.Recv(m); err != nil { - if logger.V(logger.ErrorLevel) { - logger.Error(t.opts.Context, err.Error()) + if logger.DefaultLogger.V(logger.ErrorLevel) { + logger.DefaultLogger.Error(t.opts.Context, err.Error(), err) } if err = c.Close(); err != nil { - if logger.V(logger.ErrorLevel) { - logger.Error(t.opts.Context, err.Error()) + if logger.DefaultLogger.V(logger.ErrorLevel) { + logger.DefaultLogger.Error(t.opts.Context, err.Error(), err) } } continue diff --git a/register/memory/memory.go b/register/memory/memory.go index b674bddd..ed241c4f 100644 --- a/register/memory/memory.go +++ b/register/memory/memory.go @@ -2,6 +2,7 @@ package register import ( "context" + "fmt" "sync" "time" @@ -64,7 +65,7 @@ func (m *memory) ttlPrune() { for id, n := range record.Nodes { if n.TTL != 0 && time.Since(n.LastSeen) > n.TTL { if m.opts.Logger.V(logger.DebugLevel) { - m.opts.Logger.Debugf(m.opts.Context, "Register TTL expired for node %s of service %s", n.ID, service) + m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register TTL expired for node %s of service %s", n.ID, service)) } delete(m.records[domain][service][version].Nodes, id) } @@ -151,7 +152,7 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi if _, ok := srvs[s.Name][s.Version]; !ok { srvs[s.Name][s.Version] = r if m.opts.Logger.V(logger.DebugLevel) { - m.opts.Logger.Debugf(m.opts.Context, "Register added new service: %s, version: %s", s.Name, s.Version) + m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register added new service: %s, version: %s", s.Name, s.Version)) } m.records[options.Domain] = srvs go m.sendEvent(®ister.Result{Action: "create", Service: s}) @@ -191,14 +192,14 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi if addedNodes { if m.opts.Logger.V(logger.DebugLevel) { - m.opts.Logger.Debugf(m.opts.Context, "Register added new node to service: %s, version: %s", s.Name, s.Version) + m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register added new node to service: %s, version: %s", s.Name, s.Version)) } go m.sendEvent(®ister.Result{Action: "update", Service: s}) } else { // refresh TTL and timestamp for _, n := range s.Nodes { if m.opts.Logger.V(logger.DebugLevel) { - m.opts.Logger.Debugf(m.opts.Context, "Updated registration for service: %s, version: %s", s.Name, s.Version) + m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Updated registration for service: %s, version: %s", s.Name, s.Version)) } srvs[s.Name][s.Version].Nodes[n.ID].TTL = options.TTL srvs[s.Name][s.Version].Nodes[n.ID].LastSeen = time.Now() @@ -243,7 +244,7 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re for _, n := range s.Nodes { if _, ok := version.Nodes[n.ID]; ok { if m.opts.Logger.V(logger.DebugLevel) { - m.opts.Logger.Debugf(m.opts.Context, "Register removed node from service: %s, version: %s", s.Name, s.Version) + m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register removed node from service: %s, version: %s", s.Name, s.Version)) } delete(version.Nodes, n.ID) } @@ -264,7 +265,7 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re go m.sendEvent(®ister.Result{Action: "delete", Service: s}) if m.opts.Logger.V(logger.DebugLevel) { - m.opts.Logger.Debugf(m.opts.Context, "Register removed service: %s", s.Name) + m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register removed service: %s", s.Name)) } return nil } @@ -273,7 +274,7 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re delete(m.records[options.Domain][s.Name], s.Version) go m.sendEvent(®ister.Result{Action: "delete", Service: s}) if m.opts.Logger.V(logger.DebugLevel) { - m.opts.Logger.Debugf(m.opts.Context, "Register removed service: %s, version: %s", s.Name, s.Version) + m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register removed service: %s, version: %s", s.Name, s.Version)) } return nil diff --git a/server/noop.go b/server/noop.go index 6d2ecc05..c4acf493 100644 --- a/server/noop.go +++ b/server/noop.go @@ -459,7 +459,7 @@ func (n *noopServer) Start() error { } } else if rerr != nil && !registered { if config.Logger.V(logger.ErrorLevel) { - config.Logger.Errorf(n.opts.Context, fmt.Sprintf("server %s-%s register check error", config.Name, config.ID), rerr) + config.Logger.Error(n.opts.Context, fmt.Sprintf("server %s-%s register check error", config.Name, config.ID), rerr) } continue } diff --git a/service.go b/service.go index 7a9c3a46..a15897d4 100644 --- a/service.go +++ b/service.go @@ -276,7 +276,7 @@ func (s *service) Start() error { } if config.Loggers[0].V(logger.InfoLevel) { - config.Loggers[0].Infof(s.opts.Context, "starting [service] %s version %s", s.Options().Name, s.Options().Version) + config.Loggers[0].Info(s.opts.Context, fmt.Sprintf("starting [service] %s version %s", s.Options().Name, s.Options().Version)) } if len(s.opts.Servers) == 0 { @@ -322,7 +322,7 @@ func (s *service) Stop() error { s.RUnlock() if config.Loggers[0].V(logger.InfoLevel) { - config.Loggers[0].Infof(s.opts.Context, "stoppping [service] %s", s.Name()) + config.Loggers[0].Info(s.opts.Context, fmt.Sprintf("stoppping [service] %s", s.Name())) } var err error diff --git a/tracer/memory/memory_test.go b/tracer/memory/memory_test.go index 7a6dddd6..bf2b88de 100644 --- a/tracer/memory/memory_test.go +++ b/tracer/memory/memory_test.go @@ -17,14 +17,14 @@ func TestLoggerWithTracer(t *testing.T) { buf := bytes.NewBuffer(nil) logger.DefaultLogger = slog.NewLogger(logger.WithOutput(buf)) - if err := logger.Init(); err != nil { + if err := logger.DefaultLogger.Init(); err != nil { t.Fatal(err) } var span tracer.Span tr := NewTracer() ctx, span = tr.Start(ctx, "test1") - logger.Error(ctx, "my test error", fmt.Errorf("error")) + logger.DefaultLogger.Error(ctx, "my test error", fmt.Errorf("error")) if !strings.Contains(buf.String(), span.TraceID()) { t.Fatalf("log does not contains trace id: %s", buf.Bytes()) diff --git a/util/id/id.go b/util/id/id.go index 2d094f1f..f7d34563 100644 --- a/util/id/id.go +++ b/util/id/id.go @@ -71,7 +71,7 @@ func New(opts ...Option) (string, error) { func Must(opts ...Option) string { id, err := New(opts...) if err != nil { - logger.Fatal(context.TODO(), err) + logger.DefaultLogger.Fatal(context.TODO(), "Must call is failed", err) } return id }