Merge pull request #65 from cdr/ammar

Fixes from Ammar's review

Author: nhooyr

internal/entryhuman/entry.go

@@ -58,8 +58,8 @@ func Fmt(w io.Writer, ent slog.SinkEntry) string {
 	level = c(w, levelColor(ent.Level)).Sprint(level)
 	ents += fmt.Sprintf("%v\t", level)
 
-	if ent.LoggerName != "" {
-		component := "(" + quoteKey(ent.LoggerName) + ")"
+	if len(ent.Names) > 0 {
+		component := "(" + quoteKey(strings.Join(ent.Names, ".")) + ")"
 		component = c(w, color.FgMagenta).Sprint(component)
 		ents += fmt.Sprintf("%v\t", component)
 	}

internal/entryhuman/entry_test.go

@@ -51,8 +51,8 @@ line2`)
 		t.Parallel()
 
 		test(t, slog.SinkEntry{
-			Level:      slog.LevelWarn,
-			LoggerName: "named.meow",
+			Level: slog.LevelWarn,
+			Names: []string{"named", "meow"},
 		}, `0001-01-01 00:00:00.000 [WARN]	(named.meow)	<.:0>	""`)
 	})
 

map_test.go

@@ -21,6 +21,7 @@ func TestMap(t *testing.T) {
 	t.Parallel()
 
 	test := func(t *testing.T, m slog.Map, exp string) {
+		t.Helper()
 		exp = indentJSON(t, exp)
 		act := marshalJSON(t, m)
 		assert.Equal(t, exp, act, "JSON")
@@ -61,12 +62,12 @@ func TestMap(t *testing.T) {
 				{
 					"msg": "wrap1",
 					"fun": "cdr.dev/slog_test.TestMap.func2",
-					"loc": "`+mapTestFile+`:40" 
+					"loc": "`+mapTestFile+`:41" 
 				},
 				{
 					"msg": "wrap2",
 					"fun": "cdr.dev/slog_test.TestMap.func2",
-					"loc": "`+mapTestFile+`:41" 
+					"loc": "`+mapTestFile+`:42" 
 				},
 				"EOF"
 			],
@@ -82,7 +83,7 @@ func TestMap(t *testing.T) {
 	t.Run("badJSON", func(t *testing.T) {
 		t.Parallel()
 
-		mapTestFile = strings.Replace(mapTestFile, "_test", "", 1)
+		mapTestFile := strings.Replace(mapTestFile, "_test", "", 1)
 
 		test(t, slog.M(
 			slog.F("meow", indentJSON),
@@ -92,7 +93,7 @@ func TestMap(t *testing.T) {
 					{
 						"msg": "failed to marshal to JSON",
 						"fun": "cdr.dev/slog.encode",
-						"loc": "`+mapTestFile+`:84"
+						"loc": "`+mapTestFile+`:88"
 					},
 					"json: unsupported type: func(*testing.T, string) string"
 				],

slog.go

@@ -77,7 +77,9 @@ type SinkEntry struct {
 	Level   Level
 	Message string
 
-	LoggerName string
+	// Names represents the chain of names on the
+	// logger constructed with Named.
+	Names []string
 
 	Func string
 	File string
@@ -143,7 +145,7 @@ func Make(s Sink) Logger {
 }
 
 type sink struct {
-	name   string
+	name   []string
 	sink   Sink
 	level  *int64
 	fields Map
@@ -160,12 +162,9 @@ func (s sink) withFields(fields Map) sink {
 	return s
 }
 
-func (s sink) named(name string) sink {
-	if s.name == "" {
-		s.name = name
-	} else if name != "" {
-		s.name += "." + name
-	}
+func (s sink) named(names ...string) sink {
+	s.name = append([]string(nil), s.name...)
+	s.name = append(s.name, names...)
 	return s
 }
 
@@ -343,9 +342,9 @@ func (ent SinkEntry) fillLoc(skip int) SinkEntry {
 func (s sink) entry(ctx context.Context, ent SinkEntry) SinkEntry {
 	s = s.withContext(ctx)
 	s = s.withFields(ent.Fields)
-	s = s.named(ent.LoggerName)
+	s = s.named(ent.Names...)
 
-	ent.LoggerName = s.name
+	ent.Names = s.name
 	ent.Fields = s.fields
 
 	return ent

slog_test.go

@@ -108,7 +108,7 @@ func TestLogger(t *testing.T) {
 			Level:   slog.LevelInfo,
 			Message: "meow",
 
-			LoggerName: "hello.hello2",
+			Names: []string{"hello", "hello2"},
 
 			File: slogTestFile,
 			Func: "cdr.dev/slog_test.TestLogger.func3",

sloggers/slogjson/slogjson.go

@@ -49,12 +49,15 @@ func (s jsonSink) LogEntry(ctx context.Context, ent slog.SinkEntry) error {
 	m := slog.M(
 		slog.F("ts", ent.Time),
 		slog.F("level", ent.Level),
-		slog.F("component", ent.LoggerName),
 		slog.F("msg", ent.Message),
 		slog.F("caller", fmt.Sprintf("%v:%v", ent.File, ent.Line)),
 		slog.F("func", ent.Func),
 	)
 
+	if len(ent.Names) > 0 {
+		m = append(m, slog.F("component", ent.Names))
+	}
+
 	if ent.SpanContext != (trace.SpanContext{}) {
 		m = append(m,
 			slog.F("trace", ent.SpanContext.TraceID),

sloggers/slogjson/slogjson_test.go

@@ -28,7 +28,7 @@ func TestMake(t *testing.T) {
 	l.Error(ctx, "line1\n\nline2", slog.F("wowow", "me\nyou"))
 
 	j := entryjson.Filter(b.String(), "ts")
-	exp := fmt.Sprintf(`{"level":"ERROR","component":"","msg":"line1\n\nline2","caller":"%v:28","func":"cdr.dev/slog/sloggers/slogjson_test.TestMake","trace":"%v","span":"%v","fields":{"wowow":"me\nyou"}}
+	exp := fmt.Sprintf(`{"level":"ERROR","msg":"line1\n\nline2","caller":"%v:28","func":"cdr.dev/slog/sloggers/slogjson_test.TestMake","trace":"%v","span":"%v","fields":{"wowow":"me\nyou"}}
 `, slogjsonTestFile, s.SpanContext().TraceID, s.SpanContext().SpanID)
 	assert.Equal(t, exp, j, "entry")
 }

sloggers/slogstackdriver/slogstackdriver.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"strings"
 
 	"cloud.google.com/go/compute/metadata"
 	"go.opencensus.io/trace"
@@ -58,9 +59,9 @@ func (s stackdriverSink) LogEntry(ctx context.Context, ent slog.SinkEntry) error
 		}),
 	)
 
-	if ent.LoggerName != "" {
+	if len(ent.Names) > 0 {
 		e = append(e, slog.F("logging.googleapis.com/operation", &logpb.LogEntryOperation{
-			Producer: ent.LoggerName,
+			Producer: strings.Join(ent.Names, "."),
 		}))
 	}