From 4d38c842bf4e32f6a4ce684a0985a03831db9b5c Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Tue, 5 Dec 2023 10:10:54 +0100 Subject: [PATCH] log: undo New-renaming for handler constructors --- internal/debug/flags.go | 6 +++--- log/handler.go | 8 ++++---- log/logger_test.go | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 228213053a..23e4745e8c 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -241,11 +241,11 @@ func Setup(ctx *cli.Context) error { case ctx.Bool(logjsonFlag.Name): // Retain backwards compatibility with `--log.json` flag if `--log.format` not set defer log.Warn("The flag '--log.json' is deprecated, please use '--log.format=json' instead") - handler = log.NewJSONHandler(output) + handler = log.JSONHandler(output) case logFmtFlag == "json": - handler = log.NewJSONHandler(output) + handler = log.JSONHandler(output) case logFmtFlag == "logfmt": - handler = log.NewLogfmtHandler(output) + handler = log.LogfmtHandler(output) case logFmtFlag == "", logFmtFlag == "terminal": useColor := (isatty.IsTerminal(os.Stderr.Fd()) || isatty.IsCygwinTerminal(os.Stderr.Fd())) && os.Getenv("TERM") != "dumb" if useColor { diff --git a/log/handler.go b/log/handler.go index 3a205902de..7459aad891 100644 --- a/log/handler.go +++ b/log/handler.go @@ -113,18 +113,18 @@ func (l *leveler) Level() slog.Level { return l.minLevel } -// NewJSONHandler returns a handler which prints records in JSON format. -func NewJSONHandler(wr io.Writer) slog.Handler { +// JSONHandler returns a handler which prints records in JSON format. +func JSONHandler(wr io.Writer) slog.Handler { return slog.NewJSONHandler(wr, &slog.HandlerOptions{ ReplaceAttr: builtinReplaceJSON, }) } -// NewLogfmtHandler returns a handler which prints records in logfmt format, an easy machine-parseable but human-readable +// LogfmtHandler returns a handler which prints records in logfmt format, an easy machine-parseable but human-readable // format for key/value pairs. // // For more details see: http://godoc.org/github.com/kr/logfmt -func NewLogfmtHandler(wr io.Writer) slog.Handler { +func LogfmtHandler(wr io.Writer) slog.Handler { return slog.NewTextHandler(wr, &slog.HandlerOptions{ ReplaceAttr: builtinReplaceLogfmt, }) diff --git a/log/logger_test.go b/log/logger_test.go index a2a114bb5f..a633f5ad7a 100644 --- a/log/logger_test.go +++ b/log/logger_test.go @@ -62,12 +62,12 @@ func BenchmarkTerminalHandler(b *testing.B) { benchmarkLogger(b, l) } func BenchmarkLogfmtHandler(b *testing.B) { - l := NewLogger(NewLogfmtHandler(io.Discard)) + l := NewLogger(LogfmtHandler(io.Discard)) benchmarkLogger(b, l) } func BenchmarkJSONHandler(b *testing.B) { - l := NewLogger(NewJSONHandler(io.Discard)) + l := NewLogger(JSONHandler(io.Discard)) benchmarkLogger(b, l) }