Merge branch 'master' into feat/meshmodel-summary-filters-registry-api

Author: Amr-Shams

.github/ISSUE_TEMPLATE/bug_report.md

@@ -34,5 +34,5 @@ assignees: ''
 - 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/contributing/build-and-release)
 - 📚 [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
    - Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
-- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
+- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/GvB8SudhEOoq3JOvoLaoMs)
 - 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)

.golangci.yml

@@ -3,11 +3,7 @@ version: "2"
 run:
   timeout: 5m
 
-linters-settings:
-  staticcheck:
-    go: "1.25"
-    checks: ["all", "-ST1005"]
-
-issues:
-  exclude:
-    - "ST1005"
+linters:
+  settings:
+    staticcheck:
+      checks: ["all", "-ST1005"]

logger/controller.go

@@ -46,11 +46,13 @@ func (c *Controller) V(level int) *Controller {
 }
 
 func (c *Controller) WithValues(keysAndValues ...interface{}) logr.LogSink {
-	c.base.handler.Log(logrus.InfoLevel, keysAndValues...)
+	c.base.defaultHandler.Log(logrus.InfoLevel, keysAndValues...)
+	c.base.errorHandler.Log(logrus.ErrorLevel, keysAndValues...)
 	return c
 }
 
 func (c *Controller) WithName(name string) logr.LogSink {
-	c.base.handler.WithField("name", name)
+	c.base.defaultHandler.WithField("name", name)
+	c.base.errorHandler.WithField("name", name)
 	return c
 }

logger/database.go

@@ -24,18 +24,18 @@ func (c *Database) LogMode(level gormlogger.LogLevel) gormlogger.Interface {
 	return c
 }
 func (c *Database) Info(ctx context.Context, msg string, data ...interface{}) {
-	c.base.handler.Log(logrus.InfoLevel,
-		"msg", data,
+	c.base.defaultHandler.Log(logrus.InfoLevel,
+		msg, data,
 	)
 }
 func (c *Database) Warn(ctx context.Context, msg string, data ...interface{}) {
-	c.base.handler.Log(logrus.WarnLevel,
-		"msg", data,
+	c.base.defaultHandler.Log(logrus.WarnLevel,
+		msg, data,
 	)
 }
 func (c *Database) Error(ctx context.Context, msg string, data ...interface{}) {
-	c.base.handler.Log(logrus.ErrorLevel,
-		"msg", data,
+	c.base.errorHandler.Log(logrus.ErrorLevel,
+		msg, data,
 	)
 }
 func (c *Database) Trace(ctx context.Context, begin time.Time, fc func() (string, int64), err error) {

logger/logger.go

@@ -32,7 +32,8 @@ type Handler interface {
 }
 
 type Logger struct {
-	handler *logrus.Entry
+	defaultHandler *logrus.Entry
+	errorHandler   *logrus.Entry
 }
 
 // TerminalFormatter is exported
@@ -54,7 +55,7 @@ func (f *TerminalFormatter) Format(entry *logrus.Entry) ([]byte, error) {
 	return append([]byte(msg), '\n'), nil
 }
 
-func New(appname string, opts Options) (Handler, error) {
+func newLogrusLogger(appname string, opts Options, defaultOutput io.Writer) *logrus.Entry {
 	log := logrus.New()
 
 	switch opts.Format {
@@ -81,43 +82,52 @@ func New(appname string, opts Options) (Handler, error) {
 		log.AddHook(&CallerHook{skippedPaths: skippedPaths})
 	}
 
-	log.SetOutput(os.Stdout)
+	log.SetOutput(defaultOutput)
 	if opts.Output != nil {
 		log.SetOutput(opts.Output)
 	}
 
+	if opts.ErrorOutput != nil {
+		log.SetOutput(opts.ErrorOutput)
+	}
+
 	log.SetLevel(logrus.Level(opts.LogLevel))
 
-	entry := log.WithFields(logrus.Fields{"app": appname})
-	return &Logger{handler: entry}, nil
+	return log.WithFields(logrus.Fields{"app": appname})
+}
+
+func New(appname string, opts Options) (Handler, error) {
+	entry := newLogrusLogger(appname, opts, os.Stdout)
+	errEntry := newLogrusLogger(appname, opts, os.Stderr)
+	return &Logger{defaultHandler: entry, errorHandler: errEntry}, nil
 }
 
 func (l *Logger) Info(description ...interface{}) {
-	l.handler.Log(logrus.InfoLevel,
+	l.defaultHandler.Log(logrus.InfoLevel,
 		description...,
 	)
 }
 
 func (l *Logger) Infof(format string, args ...interface{}) {
-	l.handler.Log(logrus.InfoLevel, fmt.Sprintf(format, args...))
+	l.defaultHandler.Log(logrus.InfoLevel, fmt.Sprintf(format, args...))
 }
 
 func (l *Logger) Debug(description ...interface{}) {
-	l.handler.Log(logrus.DebugLevel,
+	l.defaultHandler.Log(logrus.DebugLevel,
 		description...,
 	)
 }
 
 func (l *Logger) Debugf(format string, args ...interface{}) {
-	l.handler.Log(logrus.DebugLevel, fmt.Sprintf(format, args...))
+	l.defaultHandler.Log(logrus.DebugLevel, fmt.Sprintf(format, args...))
 }
 
 func (l *Logger) Warn(err error) {
 	if err == nil {
 		return
 	}
 
-	l.handler.WithFields(logrus.Fields{
+	l.defaultHandler.WithFields(logrus.Fields{
 		"code":                  errors.GetCode(err),
 		"severity":              errors.GetSeverity(err),
 		"short-description":     errors.GetSDescription(err),
@@ -127,15 +137,15 @@ func (l *Logger) Warn(err error) {
 }
 
 func (l *Logger) Warnf(format string, args ...interface{}) {
-	l.handler.Log(logrus.WarnLevel, fmt.Sprintf(format, args...))
+	l.defaultHandler.Log(logrus.WarnLevel, fmt.Sprintf(format, args...))
 }
 
 func (l *Logger) Error(err error) {
 	if err == nil {
 		return
 	}
 
-	l.handler.WithFields(logrus.Fields{
+	l.errorHandler.WithFields(logrus.Fields{
 		"code":                  errors.GetCode(err),
 		"severity":              errors.GetSeverity(err),
 		"short-description":     errors.GetSDescription(err),
@@ -145,15 +155,15 @@ func (l *Logger) Error(err error) {
 }
 
 func (l *Logger) Errorf(format string, args ...interface{}) {
-	l.handler.Log(logrus.ErrorLevel, fmt.Sprintf(format, args...))
+	l.errorHandler.Log(logrus.ErrorLevel, fmt.Sprintf(format, args...))
 }
 
 func (l *Logger) Fatal(err error) {
 	if err == nil {
 		return
 	}
 
-	l.handler.WithFields(logrus.Fields{
+	l.errorHandler.WithFields(logrus.Fields{
 		"code":                  errors.GetCode(err),
 		"severity":              errors.GetSeverity(err),
 		"short-description":     errors.GetSDescription(err),
@@ -164,18 +174,23 @@ func (l *Logger) Fatal(err error) {
 }
 
 func (l *Logger) Fatalf(format string, args ...interface{}) {
-	l.handler.Log(logrus.FatalLevel, fmt.Sprintf(format, args...))
+	l.errorHandler.Log(logrus.FatalLevel, fmt.Sprintf(format, args...))
 	os.Exit(1)
 }
 
 func (l *Logger) SetLevel(level logrus.Level) {
-	l.handler.Logger.SetLevel(level)
+	l.defaultHandler.Logger.SetLevel(level)
+	l.errorHandler.Logger.SetLevel(level)
 }
 
 func (l *Logger) GetLevel() logrus.Level {
-	return l.handler.Logger.GetLevel()
+	return l.defaultHandler.Logger.GetLevel()
 }
 
 func (l *Logger) UpdateLogOutput(output io.Writer) {
-	l.handler.Logger.SetOutput(output)
+	l.defaultHandler.Logger.SetOutput(output)
+}
+
+func (l *Logger) UpdateErrorLogOutput(output io.Writer) {
+	l.errorHandler.Logger.SetOutput(output)
 }