Color keys according to level

ammario · ammario · commit cf7a157a04a5 · 2023-05-08T16:38:00.000-05:00
diff --git a/internal/entryhuman/entry.go b/internal/entryhuman/entry.go
@@ -36,9 +36,8 @@ const TimeFormat = "2006-01-02 15:04:05.000"
 var (
 	renderer = lipgloss.NewRenderer(os.Stdout, termenv.WithUnsafe())
 
-	loggerNameStyle   = renderer.NewStyle().Foreground(lipgloss.Color("#A47DFF"))
-	keyStyle          = renderer.NewStyle().Foreground(lipgloss.Color("#606366"))
-	multiLineKeyStyle = renderer.NewStyle().Foreground(lipgloss.Color("#79b8ff"))
+	loggerNameStyle = renderer.NewStyle().Foreground(lipgloss.Color("#A47DFF"))
+	timeStyle       = renderer.NewStyle().Foreground(lipgloss.Color("#606366"))
 )
 
 func render(w io.Writer, st lipgloss.Style, s string) string {
@@ -70,9 +69,9 @@ func Fmt(
 ) {
 	reset(buf, termW)
 	ts := ent.Time.Format(TimeFormat)
-	buf.WriteString(ts + " ")
+	buf.WriteString(render(termW, timeStyle, ts+" "))
 
-	level := strings.ToLower(ent.Level.String())
+	level := ent.Level.String()
 	if len(level) > 4 {
 		level = level[:4]
 	}
@@ -127,6 +126,11 @@ func Fmt(
 		multilineVal = s
 	}
 
+	// Basic keyStyle off of the level makes it easy to distinguish individual
+	// entries in a fast stream of logs where some are multi-line.
+	// See logrus for an example.
+	keyStyle := levelStyle(ent.Level).Copy().Bold(false)
+
 	for i, f := range ent.Fields {
 		if i < len(ent.Fields) {
 			buf.WriteString("\t")
@@ -150,7 +154,7 @@ func Fmt(
 		}
 		multilineVal = strings.Join(lines, "\n")
 
-		multilineKey = render(termW, multiLineKeyStyle, multilineKey)
+		multilineKey = render(termW, keyStyle, multilineKey)
 		buf.WriteString("\n")
 		buf.WriteString(multilineKey)
 		buf.WriteString("= ")
diff --git a/internal/entryhuman/testdata/funky.golden b/internal/entryhuman/testdata/funky.golden
@@ -1 +1 @@
-0001-01-01 00:00:00.000 [warn]		funky^%&^&^key=value	funky^%&^&^key2="@#\t \t \n"
+0001-01-01 00:00:00.000 [WARN]		funky^%&^&^key=value	funky^%&^&^key2="@#\t \t \n"
diff --git a/internal/entryhuman/testdata/multilineField.golden b/internal/entryhuman/testdata/multilineField.golden
@@ -1,3 +1,3 @@
-0001-01-01 00:00:00.000 [info]	msg ...
+0001-01-01 00:00:00.000 [INFO]	msg ...
 field= line1
        line2
diff --git a/internal/entryhuman/testdata/multilineMessage.golden b/internal/entryhuman/testdata/multilineMessage.golden
@@ -1,3 +1,3 @@
-0001-01-01 00:00:00.000 [info]	...
+0001-01-01 00:00:00.000 [INFO]	...
 msg= line1
      line2
diff --git a/internal/entryhuman/testdata/named.golden b/internal/entryhuman/testdata/named.golden
@@ -1 +1 @@
-0001-01-01 00:00:00.000 [warn]	(named.meow)	
+0001-01-01 00:00:00.000 [WARN]	(named.meow)	
diff --git a/internal/entryhuman/testdata/simpleNoFields.golden b/internal/entryhuman/testdata/simpleNoFields.golden
@@ -1 +1 @@
-2000-02-05 04:04:04.000 [debu]	wowowow	izi
+2000-02-05 04:04:04.000 [DEBU]	wowowow	izi
diff --git a/internal/entryhuman/testdata/spacey.golden b/internal/entryhuman/testdata/spacey.golden
@@ -1 +1 @@
-0001-01-01 00:00:00.000 [warn]		space_in_my_key="value in my value"
+0001-01-01 00:00:00.000 [WARN]		space_in_my_key="value in my value"
diff --git a/sloggers/sloghuman/sloghuman_test.go b/sloggers/sloghuman/sloghuman_test.go
@@ -26,7 +26,7 @@ func TestMake(t *testing.T) {
 	et, rest, err := entryhuman.StripTimestamp(b.String())
 	assert.Success(t, "strip timestamp", err)
 	assert.False(t, "timestamp", et.IsZero())
-	assert.Equal(t, "entry", " [info]\t...\twowow=\"me\\nyou\"\n  msg= line1\n\n       line2\n", rest)
+	assert.Equal(t, "entry", " [INFO]\t...\twowow=\"me\\nyou\"\n  msg= line1\n\n       line2\n", rest)
 }
 
 func TestVisual(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0001-01-01 00:00:00.000 [warn] funky^%&^&^key=value funky^%&^&^key2="@#\t \t \n"`
	`1`	`+0001-01-01 00:00:00.000 [WARN] funky^%&^&^key=value funky^%&^&^key2="@#\t \t \n"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0001-01-01 00:00:00.000 [warn] (named.meow)`
	`1`	`+0001-01-01 00:00:00.000 [WARN] (named.meow)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2000-02-05 04:04:04.000 [debu] wowowow izi`
	`1`	`+2000-02-05 04:04:04.000 [DEBU] wowowow izi`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0001-01-01 00:00:00.000 [warn] space_in_my_key="value in my value"`
	`1`	`+0001-01-01 00:00:00.000 [WARN] space_in_my_key="value in my value"`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func TestMake(t *testing.T) {`
`26`	`26`	`et, rest, err := entryhuman.StripTimestamp(b.String())`
`27`	`27`	`assert.Success(t, "strip timestamp", err)`
`28`	`28`	`assert.False(t, "timestamp", et.IsZero())`
`29`		`- assert.Equal(t, "entry", " [info]\t...\twowow=\"me\\nyou\"\n msg= line1\n\n line2\n", rest)`
	`29`	`+ assert.Equal(t, "entry", " [INFO]\t...\twowow=\"me\\nyou\"\n msg= line1\n\n line2\n", rest)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`func TestVisual(t *testing.T) {`