diff options
| author | Antonio Pitasi <antonio@pitasi.dev> | 2025-05-21 11:58:13 +0200 |
|---|---|---|
| committer | Sean Liao <sean@liao.dev> | 2025-05-24 08:48:53 -0700 |
| commit | 3fd729b2a14a7efcf08465cbea60a74da5457f06 (patch) | |
| tree | 03275052662c0b9585072a2ccfa5138e4d4bc242 | |
| parent | c07ffe980a52b309d48d33265cfee438a01cb513 (diff) | |
| download | go-3fd729b2a14a7efcf08465cbea60a74da5457f06.tar.xz | |
log/slog: make TextHandler discard empty Source
Fixes #73808
Change-Id: Ica4b7a63eebbf0fff41d68f4de928f9da90c8ada
Reviewed-on: https://go-review.googlesource.com/c/go/+/674875
Reviewed-by: Jonathan Amsterdam <jba@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Sean Liao <sean@liao.dev>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
| -rw-r--r-- | src/log/slog/handler.go | 3 | ||||
| -rw-r--r-- | src/log/slog/handler_test.go | 2 | ||||
| -rw-r--r-- | src/log/slog/record.go | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/log/slog/handler.go b/src/log/slog/handler.go index e56be5f494..26eb4b82fc 100644 --- a/src/log/slog/handler.go +++ b/src/log/slog/handler.go @@ -492,6 +492,9 @@ func (s *handleState) appendAttr(a Attr) bool { // Special case: Source. if v := a.Value; v.Kind() == KindAny { if src, ok := v.Any().(*Source); ok { + if src.isEmpty() { + return false + } if s.h.json { a.Value = src.group() } else { diff --git a/src/log/slog/handler_test.go b/src/log/slog/handler_test.go index 445f43f1f5..3c4c36912c 100644 --- a/src/log/slog/handler_test.go +++ b/src/log/slog/handler_test.go @@ -652,7 +652,7 @@ func TestJSONAndTextHandlersWithUnavailableSource(t *testing.T) { h Handler want string }{ - {"text", NewTextHandler(&buf, opts), "source=:0 msg=message"}, + {"text", NewTextHandler(&buf, opts), "msg=message"}, {"json", NewJSONHandler(&buf, opts), `{"msg":"message"}`}, } { t.Run(test.name, func(t *testing.T) { diff --git a/src/log/slog/record.go b/src/log/slog/record.go index 53ecc67cc8..3b4e68ce76 100644 --- a/src/log/slog/record.go +++ b/src/log/slog/record.go @@ -211,6 +211,9 @@ func (s *Source) group() Value { return GroupValue(as...) } +// isEmpty returns whether the Source struct is nil or only contains zero fields. +func (s *Source) isEmpty() bool { return s == nil || *s == Source{} } + // Source returns a new Source for the log event using r's PC. // If the PC field is zero, meaning the Record was created without the necessary information // or the location is unavailable, then nil is returned. |