quic/qlog: don't output empty slog.Attrs

For golang/go#58547 Change-Id: I49a27ab82781c817511c6f7da0268529abc3f27f Reviewed-on: https://go-review.googlesource.com/c/net/+/564015 Reviewed-by: Jonathan Amsterdam <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
golang · Feb 14, 2024 · 840656f · 840656f
1 parent 5a444b4
commit 840656f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/internal/quic/qlog/json_writer.go b/internal/quic/qlog/json_writer.go
@@ -45,15 +45,15 @@ func (w *jsonWriter) writeRecordEnd() {
 func (w *jsonWriter) writeAttrs(attrs []slog.Attr) {
 	w.buf.WriteByte('{')
 	for _, a := range attrs {
-		if a.Key == "" {
-			continue
-		}
 		w.writeAttr(a)
 	}
 	w.buf.WriteByte('}')
 }
 
 func (w *jsonWriter) writeAttr(a slog.Attr) {
+	if a.Key == "" {
+		return
+	}
 	w.writeName(a.Key)
 	w.writeValue(a.Value)
 }

diff --git a/internal/quic/qlog/json_writer_test.go b/internal/quic/qlog/json_writer_test.go
@@ -85,6 +85,15 @@ func TestJSONWriterAttrs(t *testing.T) {
 			`}}`)
 }
 
+func TestJSONWriterAttrEmpty(t *testing.T) {
+	w := newTestJSONWriter()
+	w.writeRecordStart()
+	var a slog.Attr
+	w.writeAttr(a)
+	w.writeRecordEnd()
+	wantJSONRecord(t, w, `{}`)
+}
+
 func TestJSONWriterObjectEmpty(t *testing.T) {
 	w := newTestJSONWriter()
 	w.writeRecordStart()