From d6edcc38c0793ab8977701032c755569fb6e2005 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sat, 4 Apr 2020 15:05:34 +0700 Subject: [PATCH] don't qlog a packet number for Retry packets --- qlog/packet_header.go | 2 +- qlog/qlog_test.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/qlog/packet_header.go b/qlog/packet_header.go index 4ce81843f..b27d6236b 100644 --- a/qlog/packet_header.go +++ b/qlog/packet_header.go @@ -72,7 +72,7 @@ type packetHeader struct { } func (h packetHeader) MarshalJSONObject(enc *gojay.Encoder) { - enc.Int64Key("packet_number", int64(h.PacketNumber)) + enc.Int64KeyOmitEmpty("packet_number", int64(h.PacketNumber)) enc.Int64KeyOmitEmpty("payload_length", int64(h.PayloadLength)) enc.Int64KeyOmitEmpty("packet_size", int64(h.PacketSize)) if h.Version != 0 { diff --git a/qlog/qlog_test.go b/qlog/qlog_test.go index 7bbb597b4..8acd37298 100644 --- a/qlog/qlog_test.go +++ b/qlog/qlog_test.go @@ -306,6 +306,11 @@ var _ = Describe("Tracer", func() { ev := entry.Event Expect(ev).To(HaveKeyWithValue("packet_type", "retry")) Expect(ev).To(HaveKey("header")) + header := ev["header"] + Expect(header).ToNot(HaveKey("packet_number")) + Expect(header).To(HaveKey("version")) + Expect(header).To(HaveKey("dcid")) + Expect(header).To(HaveKey("scid")) Expect(ev).ToNot(HaveKey("frames")) })