Skip to content

Only call handle method on multihandler inner handler if enabled #43613

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 1 commit into from
Dec 1, 2025
+26 −2
Merged

Only call handle method on multihandler inner handler if enabled #43613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions pkg/util/log/slog/handlers/multi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ func NewMulti(handlers ...slog.Handler) slog.Handler {
func (h *multi) Handle(ctx context.Context, r slog.Record) error {
var errs []error
for _, handler := range h.handlers {
if err := handler.Handle(ctx, r); err != nil {
errs = append(errs, err)
if handler.Enabled(ctx, r.Level) {
if err := handler.Handle(ctx, r); err != nil {
errs = append(errs, err)
}
}
}
return errors.Join(errs...)
Expand Down
22 changes: 22 additions & 0 deletions pkg/util/log/slog/handlers/multi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,25 @@ func TestMultiHandlerChaining(t *testing.T) {
err := handler.Handle(context.Background(), record)
assert.NoError(t, err)
}

func TestMultiHandlerOnlyCallsEnabledHandlers(t *testing.T) {
inner1 := newMockInnerHandler()
inner1.enabled = true
inner2 := newMockInnerHandler()
inner2.enabled = false
inner3 := newMockInnerHandler()
inner3.enabled = true

handler := NewMulti(inner1, inner2, inner3)

record := slog.NewRecord(time.Now(), slog.LevelInfo, "test message", 0)
err := handler.Handle(context.Background(), record)

// Should not return error
assert.NoError(t, err)

// Only enabled handlers should have Handle called
assert.Equal(t, 1, inner1.recordCount())
assert.Equal(t, 0, inner2.recordCount())
assert.Equal(t, 1, inner3.recordCount())
}