Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

echo_logrus: implement adding fields #1171

Merged
merged 1 commit into from
May 3, 2024
Merged

echo_logrus: implement adding fields #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions cmd/image-builder/logging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,21 @@ func requestIdExtractMiddleware(next echo.HandlerFunc) echo.HandlerFunc {
ctx = context.WithValue(ctx, insightsRequestIdCtx, iid)
c.SetRequest(c.Request().WithContext(ctx))

f := logrus.Fields{"method": c.Request().Method, "path": c.Path()}
for _, key := range c.ParamNames() {
f[key] = c.Param(key)
}

// and set echo logger to be context logger
ctxLogger := logrus.StandardLogger().WithContext(ctx).Logger
ctxLogger := logrus.StandardLogger()
c.SetLogger(&common.EchoLogrusLogger{
Logger: ctxLogger,
Ctx: ctx,
Fields: f,
})

if !SkipPath(c.Path()) {
ctxLogger.WithContext(ctx).Debugf("Started request %s %s", c.Request().Method, c.Request().RequestURI)
c.Logger().Debugf("Started request")
}

return next(c)
Expand Down
46 changes: 24 additions & 22 deletions internal/common/echo_logrus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ import (
// EchoLogrusLogger extend logrus.Logger
type EchoLogrusLogger struct {
*logrus.Logger
Ctx context.Context
Ctx context.Context
Fields logrus.Fields
}

var commonLogger = &EchoLogrusLogger{
Logger: logrus.StandardLogger(),
Ctx: context.Background(),
Fields: logrus.Fields{},
}

func Logger() *EchoLogrusLogger {
Expand Down Expand Up @@ -66,113 +68,113 @@ func (l *EchoLogrusLogger) SetPrefix(p string) {
}

func (l *EchoLogrusLogger) Print(i ...interface{}) {
l.Logger.WithContext(l.Ctx).Print(i...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Print(i...)
}

func (l *EchoLogrusLogger) Printf(format string, args ...interface{}) {
l.Logger.WithContext(l.Ctx).Printf(format, args...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Printf(format, args...)
}

func (l *EchoLogrusLogger) Printj(j log.JSON) {
b, err := json.Marshal(j)
if err != nil {
panic(err)
}
l.Logger.WithContext(l.Ctx).Println(string(b))
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Println(string(b))
}

func (l *EchoLogrusLogger) Debug(i ...interface{}) {
l.Logger.WithContext(l.Ctx).Debug(i...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Debug(i...)
}

func (l *EchoLogrusLogger) Debugf(format string, args ...interface{}) {
l.Logger.WithContext(l.Ctx).Debugf(format, args...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Debugf(format, args...)
}

func (l *EchoLogrusLogger) Debugj(j log.JSON) {
b, err := json.Marshal(j)
if err != nil {
panic(err)
}
l.Logger.WithContext(l.Ctx).Debugln(string(b))
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Debugln(string(b))
}

func (l *EchoLogrusLogger) Info(i ...interface{}) {
l.Logger.WithContext(l.Ctx).Info(i...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Info(i...)
}

func (l *EchoLogrusLogger) Infof(format string, args ...interface{}) {
l.Logger.WithContext(l.Ctx).Infof(format, args...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Infof(format, args...)
}

func (l *EchoLogrusLogger) Infoj(j log.JSON) {
b, err := json.Marshal(j)
if err != nil {
panic(err)
}
l.Logger.WithContext(l.Ctx).Infoln(string(b))
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Infoln(string(b))
}

func (l *EchoLogrusLogger) Warn(i ...interface{}) {
l.Logger.WithContext(l.Ctx).Warn(i...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Warn(i...)
}

func (l *EchoLogrusLogger) Warnf(format string, args ...interface{}) {
l.Logger.WithContext(l.Ctx).Warnf(format, args...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Warnf(format, args...)
}

func (l *EchoLogrusLogger) Warnj(j log.JSON) {
b, err := json.Marshal(j)
if err != nil {
panic(err)
}
l.Logger.WithContext(l.Ctx).Warnln(string(b))
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Warnln(string(b))
}

func (l *EchoLogrusLogger) Error(i ...interface{}) {
l.Logger.WithContext(l.Ctx).Error(i...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Error(i...)
}

func (l *EchoLogrusLogger) Errorf(format string, args ...interface{}) {
l.Logger.WithContext(l.Ctx).Errorf(format, args...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Errorf(format, args...)
}

func (l *EchoLogrusLogger) Errorj(j log.JSON) {
b, err := json.Marshal(j)
if err != nil {
panic(err)
}
l.Logger.WithContext(l.Ctx).Errorln(string(b))
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Errorln(string(b))
}

func (l *EchoLogrusLogger) Fatal(i ...interface{}) {
l.Logger.WithContext(l.Ctx).Fatal(i...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Fatal(i...)
}

func (l *EchoLogrusLogger) Fatalf(format string, args ...interface{}) {
l.Logger.WithContext(l.Ctx).Fatalf(format, args...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Fatalf(format, args...)
}

func (l *EchoLogrusLogger) Fatalj(j log.JSON) {
b, err := json.Marshal(j)
if err != nil {
panic(err)
}
l.Logger.WithContext(l.Ctx).Fatalln(string(b))
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Fatalln(string(b))
}

func (l *EchoLogrusLogger) Panic(i ...interface{}) {
l.Logger.WithContext(l.Ctx).Panic(i...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Panic(i...)
}

func (l *EchoLogrusLogger) Panicf(format string, args ...interface{}) {
l.Logger.WithContext(l.Ctx).Panicf(format, args...)
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Panicf(format, args...)
}

func (l *EchoLogrusLogger) Panicj(j log.JSON) {
b, err := json.Marshal(j)
if err != nil {
panic(err)
}
l.Logger.WithContext(l.Ctx).Panicln(string(b))
l.Logger.WithContext(l.Ctx).WithFields(l.Fields).Panicln(string(b))
}
Loading