append logger names by default

rancher · Oct 20, 2023 · ece00ef · ece00ef
1 parent 48475a6
commit ece00ef
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 34 deletions.
diff --git a/pkg/logger/color_handler.go b/pkg/logger/color_handler.go
@@ -35,27 +35,27 @@ const (
 )
 
 type colorHandler struct {
-	level        slog.Leveler
-	addSource    bool
-	replaceAttr  func([]string, slog.Attr) slog.Attr
-	colorEnabled bool
-	timeFormat   string
-	attrsPrefix  string   // attrs started from With
-	groups       []string // all groups started from WithGroup
-	groupPrefix  string   // groups started from Group
-	appendName   bool
-	mu           sync.Mutex
-	w            io.Writer
+	level          slog.Leveler
+	addSource      bool
+	replaceAttr    func([]string, slog.Attr) slog.Attr
+	colorEnabled   bool
+	timeFormat     string
+	attrsPrefix    string   // attrs started from With
+	groups         []string // all groups started from WithGroup
+	groupPrefix    string   // groups started from Group
+	omitLoggerName bool
+	mu             sync.Mutex
+	w              io.Writer
 }
 
 func newColorHandler(w io.Writer, opts *LoggerOptions) slog.Handler {
 	if opts == nil {
 		opts = &LoggerOptions{
-			Level:        DefaultLogLevel,
-			AddSource:    true,
-			ColorEnabled: ColorEnabled(),
-			AppendName:   true,
-			TimeFormat:   DefaultTimeFormat,
+			Level:          DefaultLogLevel,
+			AddSource:      true,
+			ColorEnabled:   ColorEnabled(),
+			OmitLoggerName: true,
+			TimeFormat:     DefaultTimeFormat,
 		}
 	}
 
@@ -64,13 +64,13 @@ func newColorHandler(w io.Writer, opts *LoggerOptions) slog.Handler {
 	}
 
 	return &colorHandler{
-		level:        opts.Level,
-		addSource:    opts.AddSource,
-		replaceAttr:  opts.ReplaceAttr,
-		colorEnabled: opts.ColorEnabled,
-		timeFormat:   opts.TimeFormat,
-		appendName:   opts.AppendName,
-		w:            w,
+		level:          opts.Level,
+		addSource:      opts.AddSource,
+		replaceAttr:    opts.ReplaceAttr,
+		colorEnabled:   opts.ColorEnabled,
+		timeFormat:     opts.TimeFormat,
+		omitLoggerName: opts.OmitLoggerName,
+		w:              w,
 	}
 }
 
@@ -137,7 +137,7 @@ func (h *colorHandler) Handle(_ context.Context, r slog.Record) error {
 		buf.WriteByte(' ')
 	}
 
-	if h.appendName {
+	if !h.omitLoggerName {
 		h.writeGroups(buf)
 	}
 

diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
@@ -49,7 +49,7 @@ type LoggerOptions struct {
 	Sampling           *slogsampling.ThresholdSamplingOption
 	TimeFormat         string
 	TotemFormatEnabled bool
-	AppendName         bool
+	OmitLoggerName     bool
 }
 
 func ParseLevel(lvl string) slog.Level {
@@ -131,20 +131,20 @@ func WithTotemFormat(enable bool) LoggerOption {
 	}
 }
 
-func WithAppendName(enable bool) LoggerOption {
+func WithOmitLoggerName() LoggerOption {
 	return func(o *LoggerOptions) {
-		o.AppendName = enable
+		o.OmitLoggerName = true
 	}
 }
 
 func colorHandlerWithOptions(opts ...LoggerOption) slog.Handler {
 	options := &LoggerOptions{
-		Writer:       DefaultWriter,
-		ColorEnabled: ColorEnabled(),
-		Level:        DefaultLogLevel,
-		AddSource:    DefaultAddSource,
-		TimeFormat:   DefaultTimeFormat,
-		AppendName:   true,
+		Writer:         DefaultWriter,
+		ColorEnabled:   ColorEnabled(),
+		Level:          DefaultLogLevel,
+		AddSource:      DefaultAddSource,
+		TimeFormat:     DefaultTimeFormat,
+		OmitLoggerName: true,
 	}
 
 	options.apply(opts...)
@@ -155,7 +155,7 @@ func colorHandlerWithOptions(opts ...LoggerOption) slog.Handler {
 
 	var middlewares []slogmulti.Middleware
 	if options.TotemFormatEnabled {
-		options.AppendName = false
+		options.OmitLoggerName = true
 		options.Writer = os.Stderr
 		middlewares = append(middlewares, newTotemNameMiddleware())
 	}