perf: reduces by 1 allocation moving the datetime string concatenation

Author: Pho3b

internal/services/datetime_printer.go

@@ -32,8 +32,8 @@ type DateTimePrinter struct {
 	unixOnce      sync.Once
 }
 
-// RetrieveDateTime returns the current date, time, and combined/unix string based on the configuration.
-// Returns: (dateString, timeString, combinedOrUnixString).
+// RetrieveDateTime returns the current date, time, and unix string based on the configuration.
+// Returns: (dateString, timeString, unixTimeStamp).
 // If the format is UnixTimestamp, the timestamp is returned as the third value, ignoring the boolean flags.
 // Otherwise, 'addDate' and 'addTime' control which components are generated.
 func (d *DateTimePrinter) RetrieveDateTime(addDate, addTime bool) (string, string, string) {
@@ -67,10 +67,6 @@ func (d *DateTimePrinter) RetrieveDateTime(addDate, addTime bool) (string, strin
 		timeRes = d.currentTime.Load().(string)
 	}
 
-	if addDate && addTime {
-		return "", "", dateRes + " " + timeRes
-	}
-
 	return dateRes, timeRes, ""
 }
 

internal/services/json_marshaler.go

@@ -31,7 +31,7 @@ func (j *JsonMarshaler) MarshalInto(buf *bytes.Buffer, logEntry JsonLogEntry) {
 	buf.Grow(jsonCharOverhead + (averageExtraLen * extrasLen))
 
 	buf.WriteByte('{')
-	j.writeLogEntryProperties(buf, logEntry.Level, logEntry.Date, logEntry.Time, logEntry.DateTime, logEntry.DateTimeFormat)
+	j.writeLogEntryProperties(buf, logEntry.Level, logEntry.Date, logEntry.Time, logEntry.DateTimeFormat)
 
 	buf.WriteString("\"msg\":\"")
 	buf.WriteString(logEntry.Message)
@@ -114,7 +114,6 @@ func (j *JsonMarshaler) writeLogEntryProperties(
 	level string,
 	date string,
 	time string,
-	dateTime string,
 	dateTimeFormat s.DateTimeFormat,
 ) {
 	if level != "" {
@@ -124,14 +123,16 @@ func (j *JsonMarshaler) writeLogEntryProperties(
 		buf.WriteByte(',')
 	}
 
-	if dateTime != "" || (date != "" && time != "") {
+	if date != "" && time != "" {
 		if dateTimeFormat == s.UnixTimestamp {
 			buf.WriteString("\"ts\":\"")
 		} else {
 			buf.WriteString("\"datetime\":\"")
 		}
 
-		buf.WriteString(dateTime)
+		buf.WriteString(date)
+		buf.WriteByte(' ')
+		buf.WriteString(time)
 		buf.WriteByte('"')
 		buf.WriteByte(',')
 

internal/services/yaml_marshaler.go

@@ -31,7 +31,7 @@ func (y *YamlMarshaler) MarshalInto(buf *bytes.Buffer, logEntry YamlLogEntry) {
 	extrasLen := len(logEntry.Extras)
 	buf.Grow(yamlCharOverhead + (averageExtraLen * extrasLen))
 
-	y.writeLogEntryProperties(buf, logEntry.Level, logEntry.Date, logEntry.Time, logEntry.DateTime, logEntry.DateTimeFormat)
+	y.writeLogEntryProperties(buf, logEntry.Level, logEntry.Date, logEntry.Time, logEntry.DateTimeFormat)
 
 	buf.WriteString("msg: ")
 	buf.WriteString(logEntry.Message)
@@ -109,7 +109,6 @@ func (y *YamlMarshaler) writeLogEntryProperties(
 	level string,
 	date string,
 	time string,
-	dateTime string,
 	dateTimeFormat s.DateTimeFormat,
 ) {
 	if level != "" {
@@ -118,14 +117,16 @@ func (y *YamlMarshaler) writeLogEntryProperties(
 		buf.WriteByte('\n')
 	}
 
-	if dateTime != "" || (date != "" && time != "") {
+	if date != "" && time != "" {
 		if dateTimeFormat == s.UnixTimestamp {
 			buf.WriteString("ts: ")
 		} else {
 			buf.WriteString("datetime: ")
 		}
 
-		buf.WriteString(dateTime)
+		buf.WriteString(date)
+		buf.WriteByte(' ')
+		buf.WriteString(time)
 		buf.WriteByte('\n')
 
 		return

logs/encoders/default.go

@@ -90,8 +90,8 @@ func (d *DefaultEncoder) composeMsgInto(
 	}
 
 	if isDateOrTimeEnabled {
-		dateStr, timeStr, dateTimeStr := d.DateTimePrinter.RetrieveDateTime(dateEnabled, timeEnabled)
-		d.addFormattedDateTime(buf, dateStr, timeStr, dateTimeStr)
+		dateStr, timeStr, _ := d.DateTimePrinter.RetrieveDateTime(dateEnabled, timeEnabled)
+		d.addFormattedDateTime(buf, dateStr, timeStr)
 	}
 
 	if showLogLevel || isDateOrTimeEnabled {
@@ -106,25 +106,20 @@ func (d *DefaultEncoder) composeMsgInto(
 // addFormattedDateTime correctly formats the dateTime string, adding and removing square brackets
 // and white spaces as needed.
 // While formatting, it adds the dateTime string to the given buffer.
-func (d *DefaultEncoder) addFormattedDateTime(buf *bytes.Buffer, dateStr, timeStr, dateTimeStr string) {
-	if dateStr == "" && timeStr == "" && dateTimeStr == "" {
+func (d *DefaultEncoder) addFormattedDateTime(buf *bytes.Buffer, dateStr, timeStr string) {
+	if dateStr == "" && timeStr == "" {
 		return
 	}
 
 	buf.WriteByte('[')
+	buf.WriteString(dateStr)
 
-	if dateTimeStr != "" {
-		buf.WriteString(dateTimeStr)
-	} else {
-		buf.WriteString(dateStr)
-
-		if dateStr != "" && timeStr != "" {
-			buf.WriteByte(' ')
-		}
-
-		buf.WriteString(timeStr)
+	if dateStr != "" && timeStr != "" {
+		buf.WriteByte(' ')
 	}
 
+	buf.WriteString(timeStr)
+
 	buf.WriteByte(']')
 }
 

logs/encoders/json.go

@@ -84,7 +84,7 @@ func (j *JSONEncoder) composeMsgInto(
 	extras ...any,
 ) {
 	buf.Grow((averageWordLen * len(extras)) + len(msg) + 60)
-	dateStr, timeStr, dateTimeStr := j.DateTimePrinter.RetrieveDateTime(dateEnabled, timeEnabled)
+	dateStr, timeStr, _ := j.DateTimePrinter.RetrieveDateTime(dateEnabled, timeEnabled)
 
 	if !showLogLevel {
 		logLevel = ""
@@ -95,7 +95,6 @@ func (j *JSONEncoder) composeMsgInto(
 		services.JsonLogEntry{
 			Level:          logLevel.String(),
 			Date:           dateStr,
-			DateTime:       dateTimeStr,
 			Time:           timeStr,
 			DateTimeFormat: dateTimeFormat,
 			Message:        msg,

logs/encoders/yaml.go

@@ -93,13 +93,12 @@ func (y *YAMLEncoder) composeMsgInto(
 	yamlMarshaler.MarshalInto(
 		buf,
 		services.YamlLogEntry{
-			Level:          logLevel.String(),
-			Date:           date,
-			Time:           time,
-			DateTime:       dateTime,
-			DateTimeFormat: dateTimeFormat,
-			Message:        msg,
-			Extras:         extras,
+			Level:    logLevel.String(),
+			Date:     date,
+			Time:     time,
+			DateTime: dateTime,
+			Message:  msg,
+			Extras:   extras,
 		},
 	)
 }