log/slog: add LogLoggerLevel to enable setting level on the default logger

[gostls13.git] / src / log / slog / logger_test.go

diff --git a/src/log/slog/logger_test.go b/src/log/slog/logger_test.go
index 26e6f68f49c05e8a5694ee2b50ffb874ef0f9604..bb1c8a16ea46ac4b988c9a0ab27645f7e8c93440 100644 (file)
--- a/src/log/slog/logger_test.go
+++ b/src/log/slog/logger_test.go
@@ -22,7 +22,13 @@ import (
        "time"
 )
 
-const timeRE = `\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}(Z|[+-]\d{2}:\d{2})`
+// textTimeRE is a regexp to match log timestamps for Text handler.
+// This is RFC3339Nano with the fixed 3 digit sub-second precision.
+const textTimeRE = `\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}(Z|[+-]\d{2}:\d{2})`
+
+// jsonTimeRE is a regexp to match log timestamps for Text handler.
+// This is RFC3339Nano with an arbitrary sub-second precision.
+const jsonTimeRE = `\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})`
 
 func TestLogTextHandler(t *testing.T) {
        ctx := context.Background()
@@ -33,7 +39,7 @@ func TestLogTextHandler(t *testing.T) {
        check := func(want string) {
                t.Helper()
                if want != "" {
-                       want = "time=" + timeRE + " " + want
+                       want = "time=" + textTimeRE + " " + want
                }
                checkLogOutput(t, buf.String(), want)
                buf.Reset()
@@ -118,7 +124,7 @@ func TestConnections(t *testing.T) {
        // log.Logger's output goes through the handler.
        SetDefault(New(NewTextHandler(&slogbuf, &HandlerOptions{AddSource: true})))
        log.Print("msg2")
-       checkLogOutput(t, slogbuf.String(), "time="+timeRE+` level=INFO source=.*logger_test.go:\d{3}"? msg=msg2`)
+       checkLogOutput(t, slogbuf.String(), "time="+textTimeRE+` level=INFO source=.*logger_test.go:\d{3}"? msg=msg2`)
 
        // The default log.Logger always outputs at Info level.
        slogbuf.Reset()
@@ -185,6 +191,7 @@ func TestCallDepth(t *testing.T) {
                }
        }
 
+       defer SetDefault(Default()) // restore
        logger := New(h)
        SetDefault(logger)
 
@@ -357,6 +364,71 @@ func TestSetDefault(t *testing.T) {
        }
 }
 
+// Test defaultHandler minimum level without calling slog.SetDefault.
+func TestLogLoggerLevelForDefaultHandler(t *testing.T) {
+       // Revert any changes to the default logger, flags, and level of log and slog.
+       currentLogLoggerLevel := logLoggerLevel.Level()
+       currentLogWriter := log.Writer()
+       currentLogFlags := log.Flags()
+       t.Cleanup(func() {
+               logLoggerLevel.Set(currentLogLoggerLevel)
+               log.SetOutput(currentLogWriter)
+               log.SetFlags(currentLogFlags)
+       })
+
+       var logBuf bytes.Buffer
+       log.SetOutput(&logBuf)
+       log.SetFlags(0)
+
+       for _, test := range []struct {
+               logLevel Level
+               logFn    func(string, ...any)
+               want     string
+       }{
+               {LevelDebug, Debug, "DEBUG a"},
+               {LevelDebug, Info, "INFO a"},
+               {LevelInfo, Debug, ""},
+               {LevelInfo, Info, "INFO a"},
+       } {
+               SetLogLoggerLevel(test.logLevel)
+               test.logFn("a")
+               checkLogOutput(t, logBuf.String(), test.want)
+               logBuf.Reset()
+       }
+}
+
+// Test handlerWriter minimum level by calling slog.SetDefault.
+func TestLogLoggerLevelForHandlerWriter(t *testing.T) {
+       removeTime := func(_ []string, a Attr) Attr {
+               if a.Key == TimeKey {
+                       return Attr{}
+               }
+               return a
+       }
+
+       // Revert any changes to the default logger. This is important because other
+       // tests might change the default logger using SetDefault. Also ensure we
+       // restore the default logger at the end of the test.
+       currentLogger := Default()
+       currentLogLoggerLevel := logLoggerLevel.Level()
+       currentLogWriter := log.Writer()
+       currentFlags := log.Flags()
+       t.Cleanup(func() {
+               SetDefault(currentLogger)
+               logLoggerLevel.Set(currentLogLoggerLevel)
+               log.SetOutput(currentLogWriter)
+               log.SetFlags(currentFlags)
+       })
+
+       var logBuf bytes.Buffer
+       log.SetOutput(&logBuf)
+       log.SetFlags(0)
+       SetLogLoggerLevel(LevelError)
+       SetDefault(New(NewTextHandler(&logBuf, &HandlerOptions{ReplaceAttr: removeTime})))
+       log.Print("error")
+       checkLogOutput(t, logBuf.String(), `level=ERROR msg=error`)
+}
+
 func TestLoggerError(t *testing.T) {
        var buf bytes.Buffer
 
@@ -381,7 +453,7 @@ func TestNewLogLogger(t *testing.T) {
        h := NewTextHandler(&buf, nil)
        ll := NewLogLogger(h, LevelWarn)
        ll.Print("hello")
-       checkLogOutput(t, buf.String(), "time="+timeRE+` level=WARN msg=hello`)
+       checkLogOutput(t, buf.String(), "time="+textTimeRE+` level=WARN msg=hello`)
 }
 
 func TestLoggerNoOps(t *testing.T) {
@@ -633,10 +705,10 @@ func TestPanics(t *testing.T) {
                in  any
                out string
        }{
-               {(*panicTextAndJsonMarshaler)(nil), `{"time":"` + timeRE + `","level":"INFO","msg":"msg","p":null}`},
-               {panicTextAndJsonMarshaler{io.ErrUnexpectedEOF}, `{"time":"` + timeRE + `","level":"INFO","msg":"msg","p":"!PANIC: unexpected EOF"}`},
-               {panicTextAndJsonMarshaler{"panicking"}, `{"time":"` + timeRE + `","level":"INFO","msg":"msg","p":"!PANIC: panicking"}`},
-               {panicTextAndJsonMarshaler{42}, `{"time":"` + timeRE + `","level":"INFO","msg":"msg","p":"!PANIC: 42"}`},
+               {(*panicTextAndJsonMarshaler)(nil), `{"time":"` + jsonTimeRE + `","level":"INFO","msg":"msg","p":null}`},
+               {panicTextAndJsonMarshaler{io.ErrUnexpectedEOF}, `{"time":"` + jsonTimeRE + `","level":"INFO","msg":"msg","p":"!PANIC: unexpected EOF"}`},
+               {panicTextAndJsonMarshaler{"panicking"}, `{"time":"` + jsonTimeRE + `","level":"INFO","msg":"msg","p":"!PANIC: panicking"}`},
+               {panicTextAndJsonMarshaler{42}, `{"time":"` + jsonTimeRE + `","level":"INFO","msg":"msg","p":"!PANIC: 42"}`},
        } {
                Info("msg", "p", pt.in)
                checkLogOutput(t, logBuf.String(), pt.out)