diff --git a/encoder.go b/encoder.go new file mode 100644 index 0000000..9ba9369 --- /dev/null +++ b/encoder.go @@ -0,0 +1,58 @@ +package zapjournald + +import ( + "bytes" + "strings" + + "go.uber.org/zap/buffer" +) + +var pool = buffer.NewPool() + +func writeFieldBytes(buf *buffer.Buffer, name string, value []byte) { + buf.Write([]byte(name)) + if bytes.ContainsRune(value, '\n') { + // According to the format, if the value includes a newline + // need to write the field name, plus a newline, then the + // size (64bit LE), the field data and a final newline. + + buf.Write([]byte{'\n'}) + appendUint64Binary(buf, uint64(len(value))) + } else { + buf.Write([]byte{'='}) + } + buf.Write(value) + buf.Write([]byte{'\n'}) +} + +func writeField(buf *buffer.Buffer, name string, value string) { + buf.Write([]byte(name)) + if strings.ContainsRune(value, '\n') { + // According to the format, if the value includes a newline + // need to write the field name, plus a newline, then the + // size (64bit LE), the field data and a final newline. + + buf.Write([]byte{'\n'}) + // 1 allocation here. + // binary.Write(w, binary.LittleEndian, uint64(len(value))) + appendUint64Binary(buf, uint64(len(value))) + } else { + buf.Write([]byte{'='}) + } + buf.WriteString(value) + buf.Write([]byte{'\n'}) +} + +func appendUint64Binary(buf *buffer.Buffer, v uint64) { + // Copied from https://github.com/golang/go/blob/go1.21.3/src/encoding/binary/binary.go#L119 + buf.Write([]byte{ + byte(v), + byte(v >> 8), + byte(v >> 16), + byte(v >> 24), + byte(v >> 32), + byte(v >> 40), + byte(v >> 48), + byte(v >> 56), + }) +} diff --git a/zapjournald.go b/zapjournald.go index 208fa97..6ffbdeb 100644 --- a/zapjournald.go +++ b/zapjournald.go @@ -2,6 +2,7 @@ package zapjournald import ( "fmt" + "strconv" "github.com/ssgreg/journald" "go.uber.org/zap/zapcore" @@ -70,14 +71,10 @@ func (core *Core) Write(entry zapcore.Entry, fields []zapcore.Field) error { return err } - // Generate the message. - buffer, err := core.encoder.EncodeEntry(entry, fields) - if err != nil { - return fmt.Errorf("failed to encode log entry: %w", err) - } - defer buffer.Free() + b := pool.Get() + defer b.Free() - message := buffer.String() + writeField(b, "PRIORITY", strconv.Itoa(int(prio))) structuredFields := maps.Clone(core.contextStructuredFields) for _, field := range fields { @@ -85,9 +82,28 @@ func (core *Core) Write(entry zapcore.Entry, fields []zapcore.Field) error { structuredFields[field.Key] = getFieldValue(field) } } + for k, v := range structuredFields { + switch v := v.(type) { + case []byte: + writeFieldBytes(b, k, v) + case string: + writeField(b, k, v) + default: + writeField(b, k, fmt.Sprint(v)) + } + } + + // Generate the message. + buffer, err := core.encoder.EncodeEntry(entry, fields) + if err != nil { + return fmt.Errorf("failed to encode log entry: %w", err) + } + defer buffer.Free() + + writeFieldBytes(b, "MESSAGE", buffer.Bytes()) // Write the message. - return core.j.Send(message, prio, structuredFields) + return core.j.WriteMsg(b.Bytes()) } // Sync flushes buffered logs (not used).