Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 internal/serialize/keyvalues.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ func writeStringValue(b *bytes.Buffer, v string) {
if index == -1 {
b.WriteByte('=')
// Simple string, quote quotation marks and non-printable characters.
b.WriteString(strconv.Quote(v))
b.Write(strconv.AppendQuote(b.AvailableBuffer(), v))
return
}

Expand Down
20 changes: 16 additions & 4 deletions internal/serialize/keyvalues_slog.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ func generateJSON(b *bytes.Buffer, v interface{}) {
if i > 0 {
b.WriteByte(',')
}
b.WriteString(strconv.Quote(attr.Key))
b.Write(
strconv.AppendQuote(
b.AvailableBuffer(),
attr.Key))
b.WriteByte(':')
generateJSON(b, attr.Value)
}
Expand All @@ -144,15 +147,24 @@ func generateJSON(b *bytes.Buffer, v interface{}) {
generateJSON(b, v.Any())
}
case fmt.Stringer:
b.WriteString(strconv.Quote(StringerToString(v)))
b.Write(
strconv.AppendQuote(
b.AvailableBuffer(),
StringerToString(v)))
case logr.Marshaler:
generateJSON(b, MarshalerToValue(v))
case slog.LogValuer:
generateJSON(b, slog.AnyValue(v).Resolve().Any())
case string:
b.WriteString(strconv.Quote(v))
b.Write(
strconv.AppendQuote(
b.AvailableBuffer(),
v))
case error:
b.WriteString(strconv.Quote(v.Error()))
b.Write(
strconv.AppendQuote(
b.AvailableBuffer(),
v.Error()))
default:
formatAsJSON(b, v)
}
Expand Down
Loading