Handle protobuf fields appropriately

nhooyr · nhooyr · commit fbfe20934951 · 2019-12-10T12:30:57.000-06:00
diff --git a/map.go b/map.go
@@ -93,6 +93,10 @@ func encode(v interface{}) []byte {
 		return encode(v.SlogValue())
 	case xerrors.Formatter:
 		return encode(errorChain(v))
+	case interface {
+		ProtoMessage()
+	}:
+		return encode(ForceJSON(v))
 	case error, fmt.Stringer:
 		return encode(fmt.Sprint(v))
 	default:
diff --git a/map_test.go b/map_test.go
@@ -93,7 +93,7 @@ func TestMap(t *testing.T) {
 					{
 						"msg": "failed to marshal to JSON",
 						"fun": "cdr.dev/slog.encode",
-						"loc": "`+mapTestFile+`:115"
+						"loc": "`+mapTestFile+`:119"
 					},
 					"json: unsupported type: func(*testing.T, string) string"
 				],
diff --git a/sloggers/slogstackdriver/slogstackdriver_test.go b/sloggers/slogstackdriver/slogstackdriver_test.go
@@ -29,7 +29,7 @@ func TestStackdriver(t *testing.T) {
 	l.Error(ctx, "line1\n\nline2", slog.F("wowow", "me\nyou"))
 
 	j := entryjson.Filter(b.String(), "timestamp")
-	exp := fmt.Sprintf(`{"severity":"ERROR","message":"line1\n\nline2","logging.googleapis.com/sourceLocation":"file:\"%v\" line:29 function:\"cdr.dev/slog/sloggers/slogstackdriver_test.TestStackdriver\" ","logging.googleapis.com/operation":"producer:\"meow\" ","logging.googleapis.com/trace":"projects//traces/%v","logging.googleapis.com/spanId":"%v","logging.googleapis.com/trace_sampled":false,"wowow":"me\nyou"}
+	exp := fmt.Sprintf(`{"severity":"ERROR","message":"line1\n\nline2","logging.googleapis.com/sourceLocation":{"file":"%v","line":29,"function":"cdr.dev/slog/sloggers/slogstackdriver_test.TestStackdriver"},"logging.googleapis.com/operation":{"producer":"meow"},"logging.googleapis.com/trace":"projects//traces/%v","logging.googleapis.com/spanId":"%v","logging.googleapis.com/trace_sampled":false,"wowow":"me\nyou"}
 `, slogstackdriverTestFile, s.SpanContext().TraceID, s.SpanContext().SpanID)
 	assert.Equal(t, exp, j, "entry")
 }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func TestMap(t *testing.T) {`
`93`	`93`	`{`
`94`	`94`	`"msg": "failed to marshal to JSON",`
`95`	`95`	`"fun": "cdr.dev/slog.encode",`
`96`		- "loc": "`+mapTestFile+`:115"
	`96`	+ "loc": "`+mapTestFile+`:119"
`97`	`97`	`},`
`98`	`98`	`"json: unsupported type: func(*testing.T, string) string"`
`99`	`99`	`],`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func TestStackdriver(t *testing.T) {`
`29`	`29`	`l.Error(ctx, "line1\n\nline2", slog.F("wowow", "me\nyou"))`
`30`	`30`
`31`	`31`	`j := entryjson.Filter(b.String(), "timestamp")`
`32`		- exp := fmt.Sprintf(`{"severity":"ERROR","message":"line1\n\nline2","logging.googleapis.com/sourceLocation":"file:\"%v\" line:29 function:\"cdr.dev/slog/sloggers/slogstackdriver_test.TestStackdriver\" ","logging.googleapis.com/operation":"producer:\"meow\" ","logging.googleapis.com/trace":"projects//traces/%v","logging.googleapis.com/spanId":"%v","logging.googleapis.com/trace_sampled":false,"wowow":"me\nyou"}
	`32`	+ exp := fmt.Sprintf(`{"severity":"ERROR","message":"line1\n\nline2","logging.googleapis.com/sourceLocation":{"file":"%v","line":29,"function":"cdr.dev/slog/sloggers/slogstackdriver_test.TestStackdriver"},"logging.googleapis.com/operation":{"producer":"meow"},"logging.googleapis.com/trace":"projects//traces/%v","logging.googleapis.com/spanId":"%v","logging.googleapis.com/trace_sampled":false,"wowow":"me\nyou"}
`33`	`33`	`, slogstackdriverTestFile, s.SpanContext().TraceID, s.SpanContext().SpanID)
`34`	`34`	`assert.Equal(t, exp, j, "entry")`
`35`	`35`	`}`