Skip to content

Use timezone from environment for record in slog wrapper #43608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 1, 2025
Merged

Use timezone from environment for record in slog wrapper #43608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7565947
fix(logger): use timezone from environment for record
pgimalac Nov 28, 2025
3fc28c9
chore: try using a full name for windows
pgimalac Nov 28, 2025
2ddc1f0
chore: skip test on windows
pgimalac Nov 28, 2025
ad22f18
Merge branch 'main' into pgimalac/fix-slog-logger-timezone
pgimalac Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/util/log/slog/wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (w *Wrapper) handle(level types.LogLevel, message string) {
var pc [1]uintptr
runtime.Callers(baseStackDepth+w.extraStackDepth, pc[:])
r := slog.NewRecord(
time.Now().UTC(),
time.Now(),
types.ToSlogLevel(level),
message,
pc[0],
Expand Down
14 changes: 14 additions & 0 deletions pkg/util/log/slog/wrapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,3 +488,17 @@ func TestLoggingToClosedWrapperDoesNotCallHandler(t *testing.T) {
// Verify that handler was never called (no records logged)
assert.Empty(t, handler.records, "handler should not be called after wrapper is closed")
}

func TestRecordTimeZone(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("Windows uses syscalls to get the timezone, so we can't test it")
}

t.Setenv("TZ", "CET")
handler := newMockHandler()
wrapper := NewWrapper(handler)

wrapper.Info("test message")
record := handler.lastRecord()
assert.Equal(t, "CET", record.Time.Location().String())
}