Merge pull request #333 from moov-io/check-nil-on-fmt-stringer

Check nil on fmt stringer
moov-io · Oct 26, 2023 · 967cfe2 · 967cfe2
2 parents f9148cd + 3c23cdb
commit 967cfe2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/log/model_valuer.go b/log/model_valuer.go
@@ -3,6 +3,7 @@ package log
 import (
 	"encoding/base64"
 	"fmt"
+	"reflect"
 	"strings"
 	"time"
 )
@@ -93,6 +94,10 @@ func ByteBase64(b []byte) Valuer {
 }
 
 func Stringer(s fmt.Stringer) Valuer {
+	if v := reflect.ValueOf(s); v.Kind() == reflect.Pointer && v.IsNil() {
+		return &any{nil}
+	}
+
 	return &any{s.String()}
 }
 

diff --git a/log/model_valuer_test.go b/log/model_valuer_test.go
@@ -52,4 +52,14 @@ func TestValuer_Stringer(t *testing.T) {
 	}).Log("log with .String() key/value pair")
 
 	require.Contains(t, out.String(), `mode=PRODUCTION`)
+
+	out, logger = log.NewBufferLogger()
+
+	var n *Mode
+
+	logger.With(log.Fields{
+		"mode": log.Stringer(n),
+	}).Log("log with nil .String() key/value pair")
+
+	require.Contains(t, out.String(), `mode=null`)
 }