mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

log/slog: log and logAttrs initialize ctx at top 

In extreme cases (e.g., ctx = nil), it is recommended to initialize the
context only once at the entry point before using log and logAttrs.

Change-Id: Ib191963f52183406d7fcd5104b60fea1a9e1bc80
GitHub-Last-Rev: e1719b9539
GitHub-Pull-Request: golang/go#73066
Reviewed-on: https://go-review.googlesource.com/c/go/+/661255
Reviewed-by: Carlos Amedee <carlos@golang.org>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
喜欢 2025-03-28 06:39:41 +00:00 committed by Jonathan Amsterdam
parent 4c1b8ca98c
commit 7177f24009
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/log/slog/logger.go
View File

@ -238,6 +238,9 @@ func (l *Logger) ErrorContext(ctx context.Context, msg string, args ...any) {
// It must always be called directly by an exported logging method // It must always be called directly by an exported logging method
// or function, because it uses a fixed call depth to obtain the pc. // or function, because it uses a fixed call depth to obtain the pc.
func (l *Logger) log(ctx context.Context, level Level, msg string, args ...any) { func (l *Logger) log(ctx context.Context, level Level, msg string, args ...any) {
if ctx == nil {
ctx = context.Background()
}
if !l.Enabled(ctx, level) { if !l.Enabled(ctx, level) {
return return
} }
@ -250,14 +253,14 @@ func (l *Logger) log(ctx context.Context, level Level, msg string, args ...any)
} }
r := NewRecord(time.Now(), level, msg, pc) r := NewRecord(time.Now(), level, msg, pc)
r.Add(args...) r.Add(args...)
if ctx == nil {
ctx = context.Background()
}
_ = l.Handler().Handle(ctx, r) _ = l.Handler().Handle(ctx, r)
} }
// logAttrs is like [Logger.log], but for methods that take ...Attr. // logAttrs is like [Logger.log], but for methods that take ...Attr.
func (l *Logger) logAttrs(ctx context.Context, level Level, msg string, attrs ...Attr) { func (l *Logger) logAttrs(ctx context.Context, level Level, msg string, attrs ...Attr) {
if ctx == nil {
ctx = context.Background()
}
if !l.Enabled(ctx, level) { if !l.Enabled(ctx, level) {
return return
} }
@ -270,9 +273,6 @@ func (l *Logger) logAttrs(ctx context.Context, level Level, msg string, attrs ..
} }
r := NewRecord(time.Now(), level, msg, pc) r := NewRecord(time.Now(), level, msg, pc)
r.AddAttrs(attrs...) r.AddAttrs(attrs...)
if ctx == nil {
ctx = context.Background()
}
_ = l.Handler().Handle(ctx, r) _ = l.Handler().Handle(ctx, r)
} }