mirror of
https://github.com/chainguard-dev/clog
synced 2026-07-06 22:12:46 +00:00
This updates doc comments and parameter names for the Logger type to be friendlier to docs-aware editors, specifically by: - Fixing when method name in doc comment didn't match the method name - Using "msg" instead of "format" to align with the stdlib for when log messages aren't formats - Updating to explain how the variadic `args` params are used Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
204 lines
6.4 KiB
Go
204 lines
6.4 KiB
Go
package clog
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"log/slog"
|
|
"os"
|
|
"runtime"
|
|
"time"
|
|
)
|
|
|
|
// Logger implements a wrapper around [slog.Logger] that adds formatter functions (e.g. Infof, Errorf)
|
|
type Logger struct {
|
|
ctx context.Context
|
|
slog.Logger
|
|
}
|
|
|
|
// DefaultLogger returns a new logger that uses the default [slog.Logger].
|
|
func DefaultLogger() *Logger {
|
|
return NewLogger(nil)
|
|
}
|
|
|
|
// NewLogger returns a new logger that wraps the given [slog.Logger] with the default context.
|
|
func NewLogger(l *slog.Logger) *Logger {
|
|
return NewLoggerWithContext(context.Background(), l)
|
|
}
|
|
|
|
// NewLoggerWithContext returns a new logger that wraps the given [slog.Logger].
|
|
func NewLoggerWithContext(ctx context.Context, l *slog.Logger) *Logger {
|
|
if l == nil {
|
|
l = slog.New(NewHandler(slog.Default().Handler()))
|
|
}
|
|
return &Logger{
|
|
ctx: ctx,
|
|
Logger: *l,
|
|
}
|
|
}
|
|
|
|
// New returns a new logger that wraps the given [slog.Handler].
|
|
func New(h slog.Handler) *Logger {
|
|
return NewWithContext(context.Background(), h)
|
|
}
|
|
|
|
// NewWithContext returns a new logger that wraps the given [slog.Handler] using the given context.
|
|
func NewWithContext(ctx context.Context, h slog.Handler) *Logger {
|
|
return NewLoggerWithContext(ctx, slog.New(NewHandler(h)))
|
|
}
|
|
|
|
// With calls [Logger.With] on the default logger.
|
|
func With(args ...any) *Logger {
|
|
return DefaultLogger().With(args...)
|
|
}
|
|
|
|
// With calls [Logger.With] on the logger.
|
|
func (l *Logger) With(args ...any) *Logger {
|
|
return NewLoggerWithContext(l.context(), l.Logger.With(args...))
|
|
}
|
|
|
|
// WithGroup calls [Logger.WithGroup] on the default logger.
|
|
func (l *Logger) WithGroup(name string) *Logger {
|
|
return NewLoggerWithContext(l.context(), l.Logger.WithGroup(name))
|
|
}
|
|
|
|
func (l *Logger) context() context.Context {
|
|
if l.ctx == nil {
|
|
return context.Background()
|
|
}
|
|
return l.ctx
|
|
}
|
|
|
|
// Info logs at LevelInfo with the given message and treats the args as key/value pairs to form log message attributes.
|
|
func (l *Logger) Info(msg string, args ...any) {
|
|
wrap(l.context(), l, slog.LevelInfo, msg, args...)
|
|
}
|
|
|
|
// Infof logs at LevelInfo with the given format and arguments.
|
|
func (l *Logger) Infof(format string, args ...any) {
|
|
wrapf(l.context(), l, slog.LevelInfo, format, args...)
|
|
}
|
|
|
|
// InfoContextf logs at LevelInfo with the given context, format, and arguments.
|
|
func (l *Logger) InfoContextf(ctx context.Context, format string, args ...any) {
|
|
wrapf(ctx, l, slog.LevelInfo, format, args...)
|
|
}
|
|
|
|
// Warn logs at LevelWarn with the given message and treats the args as key/value pairs to form log message attributes.
|
|
func (l *Logger) Warn(msg string, args ...any) {
|
|
wrap(l.context(), l, slog.LevelWarn, msg, args...)
|
|
}
|
|
|
|
// Warnf logs at LevelWarn with the given format and arguments.
|
|
func (l *Logger) Warnf(format string, args ...any) {
|
|
wrapf(l.context(), l, slog.LevelWarn, format, args...)
|
|
}
|
|
|
|
// WarnContextf logs at LevelWarn with the given context, format and arguments.
|
|
func (l *Logger) WarnContextf(ctx context.Context, format string, args ...any) {
|
|
wrapf(ctx, l, slog.LevelWarn, format, args...)
|
|
}
|
|
|
|
// Error logs at LevelError with the given message and treats the args as key/value pairs to form log message attributes.
|
|
func (l *Logger) Error(msg string, args ...any) {
|
|
wrap(l.context(), l, slog.LevelError, msg, args...)
|
|
}
|
|
|
|
// Errorf logs at LevelError with the given format and arguments.
|
|
func (l *Logger) Errorf(format string, args ...any) {
|
|
wrapf(l.context(), l, slog.LevelError, format, args...)
|
|
}
|
|
|
|
// ErrorContextf logs at LevelError with the given context, format and arguments.
|
|
func (l *Logger) ErrorContextf(ctx context.Context, format string, args ...any) {
|
|
wrapf(ctx, l, slog.LevelError, format, args...)
|
|
}
|
|
|
|
// Debug logs at LevelDebug with the given message and treats the args as key/value pairs to form log message attributes.
|
|
func (l *Logger) Debug(msg string, args ...any) {
|
|
wrap(l.context(), l, slog.LevelDebug, msg, args...)
|
|
}
|
|
|
|
// Debugf logs at LevelDebug with the given format and arguments.
|
|
func (l *Logger) Debugf(format string, args ...any) {
|
|
wrapf(l.context(), l, slog.LevelDebug, format, args...)
|
|
}
|
|
|
|
// DebugContextf logs at LevelDebug with the given context, format and arguments.
|
|
func (l *Logger) DebugContextf(ctx context.Context, format string, args ...any) {
|
|
wrapf(ctx, l, slog.LevelDebug, format, args...)
|
|
}
|
|
|
|
// Fatal logs at LevelError with the given message, then exits.
|
|
func (l *Logger) Fatal(msg string, args ...any) {
|
|
wrap(l.context(), l, slog.LevelError, msg, args...)
|
|
os.Exit(1)
|
|
}
|
|
|
|
// Fatalf logs at LevelError with the given format and arguments, then exits.
|
|
func (l *Logger) Fatalf(format string, args ...any) {
|
|
wrapf(l.context(), l, slog.LevelError, format, args...)
|
|
os.Exit(1)
|
|
}
|
|
|
|
// FatalContextf logs at LevelError with the given context, format and arguments, then exits.
|
|
func (l *Logger) FatalContextf(ctx context.Context, format string, args ...any) {
|
|
wrapf(ctx, l, slog.LevelError, format, args...)
|
|
os.Exit(1)
|
|
}
|
|
|
|
// FatalContext logs at LevelError with the given context and message, then exits.
|
|
func (l *Logger) FatalContext(ctx context.Context, msg string, args ...any) {
|
|
wrap(ctx, l, slog.LevelError, msg, args...)
|
|
os.Exit(1)
|
|
}
|
|
|
|
// Base returns the underlying [slog.Logger].
|
|
func (l *Logger) Base() *slog.Logger {
|
|
return &l.Logger
|
|
}
|
|
|
|
// Handler returns the underlying [slog.Handler].
|
|
func (l *Logger) Handler() slog.Handler {
|
|
return l.Logger.Handler()
|
|
}
|
|
|
|
func wrap(ctx context.Context, logger *Logger, level slog.Level, msg string, args ...any) {
|
|
if !logger.Handler().Enabled(ctx, level) {
|
|
return
|
|
}
|
|
|
|
var pcs [1]uintptr
|
|
runtime.Callers(3, pcs[:]) // skip [Callers, Infof, wrapf]
|
|
r := slog.NewRecord(time.Now(), level, msg, pcs[0])
|
|
r.Add(args...)
|
|
_ = logger.Handler().Handle(ctx, r)
|
|
}
|
|
|
|
// wrapf is like wrap, but uses fmt.Sprintf to format the message.
|
|
// NOTE: args are passed to fmt.Sprintf, not as [slog.Attr].
|
|
func wrapf(ctx context.Context, logger *Logger, level slog.Level, format string, args ...any) {
|
|
if !logger.Handler().Enabled(ctx, level) {
|
|
return
|
|
}
|
|
|
|
var pcs [1]uintptr
|
|
runtime.Callers(3, pcs[:]) // skip [Callers, Infof, wrapf]
|
|
r := slog.NewRecord(time.Now(), level, fmt.Sprintf(format, args...), pcs[0])
|
|
_ = logger.Handler().Handle(ctx, r)
|
|
}
|
|
|
|
type loggerKey struct{}
|
|
|
|
func WithLogger(ctx context.Context, logger *Logger) context.Context {
|
|
return context.WithValue(ctx, loggerKey{}, logger.Logger)
|
|
}
|
|
|
|
func FromContext(ctx context.Context) *Logger {
|
|
if logger, ok := ctx.Value(loggerKey{}).(slog.Logger); ok {
|
|
return &Logger{
|
|
ctx: ctx,
|
|
Logger: logger,
|
|
}
|
|
}
|
|
return NewLoggerWithContext(ctx, nil)
|
|
}
|