Skip to content

chore: simplify, modernize (Go 1.26), update deps #97

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
rustatian merged 1 commit into from
Jun 3, 2026
Merged

chore: simplify, modernize (Go 1.26), update deps #97

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
5 changes: 3 additions & 2 deletions format_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"io"
"log/slog"
"runtime"
"slices"
"strconv"
"strings"
"sync"
Expand Down Expand Up @@ -208,8 +209,8 @@ func (h *FormatHandler) clone() *FormatHandler {
format: h.format,
timeLayout: h.timeLayout,
lineEnding: h.lineEnding,
preAttrs: append([]slog.Attr(nil), h.preAttrs...),
groups: append([]string(nil), h.groups...),
preAttrs: slices.Clone(h.preAttrs),
groups: slices.Clone(h.groups),
grpPfx: h.grpPfx,
mu: h.mu, // shared across clones
needsSource: h.needsSource,
Expand Down
16 changes: 5 additions & 11 deletions handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"io"
"log/slog"
"strings"
"sync"
)

Expand Down Expand Up @@ -34,17 +33,12 @@ func (h *RawHandler) Handle(_ context.Context, r slog.Record) error {
h.mu.Lock()
defer h.mu.Unlock()

if _, err := io.WriteString(h.w, r.Message); err != nil {
return err
msg := r.Message
if len(msg) == 0 || msg[len(msg)-1] != '\n' {
msg += "\n"
}

if !strings.HasSuffix(r.Message, "\n") {
if _, err := io.WriteString(h.w, "\n"); err != nil {
return err
}
}

return nil
_, err := io.WriteString(h.w, msg)
return err
Comment thread
rustatian marked this conversation as resolved.
}

// WithAttrs returns the same handler — raw mode discards attributes.
Expand Down
2 changes: 2 additions & 0 deletions tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,9 @@ go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhO
go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
Expand Down
Loading