diff --git a/qlog/event.go b/qlog/event.go index 8427b6e22c9..aaed65745b9 100644 --- a/qlog/event.go +++ b/qlog/event.go @@ -349,16 +349,16 @@ func (e eventKeyUpdated) MarshalJSONObject(enc *gojay.Encoder) { } } -type eventKeyRetired struct { +type eventKeyDiscarded struct { KeyType keyType Generation protocol.KeyPhase } -func (e eventKeyRetired) Category() category { return categorySecurity } -func (e eventKeyRetired) Name() string { return "key_retired" } -func (e eventKeyRetired) IsNil() bool { return false } +func (e eventKeyDiscarded) Category() category { return categorySecurity } +func (e eventKeyDiscarded) Name() string { return "key_discarded" } +func (e eventKeyDiscarded) IsNil() bool { return false } -func (e eventKeyRetired) MarshalJSONObject(enc *gojay.Encoder) { +func (e eventKeyDiscarded) MarshalJSONObject(enc *gojay.Encoder) { if e.KeyType != keyTypeClient1RTT && e.KeyType != keyTypeServer1RTT { enc.StringKey("trigger", "tls") } diff --git a/qlog/qlog.go b/qlog/qlog.go index 5b41174288f..2bce3971cd4 100644 --- a/qlog/qlog.go +++ b/qlog/qlog.go @@ -428,10 +428,10 @@ func (t *connectionTracer) DroppedEncryptionLevel(encLevel protocol.EncryptionLe t.mutex.Lock() now := time.Now() if encLevel == protocol.Encryption0RTT { - t.recordEvent(now, &eventKeyRetired{KeyType: encLevelToKeyType(encLevel, t.perspective)}) + t.recordEvent(now, &eventKeyDiscarded{KeyType: encLevelToKeyType(encLevel, t.perspective)}) } else { - t.recordEvent(now, &eventKeyRetired{KeyType: encLevelToKeyType(encLevel, protocol.PerspectiveServer)}) - t.recordEvent(now, &eventKeyRetired{KeyType: encLevelToKeyType(encLevel, protocol.PerspectiveClient)}) + t.recordEvent(now, &eventKeyDiscarded{KeyType: encLevelToKeyType(encLevel, protocol.PerspectiveServer)}) + t.recordEvent(now, &eventKeyDiscarded{KeyType: encLevelToKeyType(encLevel, protocol.PerspectiveClient)}) } t.mutex.Unlock() } @@ -439,11 +439,11 @@ func (t *connectionTracer) DroppedEncryptionLevel(encLevel protocol.EncryptionLe func (t *connectionTracer) DroppedKey(generation protocol.KeyPhase) { t.mutex.Lock() now := time.Now() - t.recordEvent(now, &eventKeyRetired{ + t.recordEvent(now, &eventKeyDiscarded{ KeyType: encLevelToKeyType(protocol.Encryption1RTT, protocol.PerspectiveServer), Generation: generation, }) - t.recordEvent(now, &eventKeyRetired{ + t.recordEvent(now, &eventKeyDiscarded{ KeyType: encLevelToKeyType(protocol.Encryption1RTT, protocol.PerspectiveClient), Generation: generation, }) diff --git a/qlog/qlog_test.go b/qlog/qlog_test.go index f43390c4cbe..d955c8d374e 100644 --- a/qlog/qlog_test.go +++ b/qlog/qlog_test.go @@ -757,7 +757,7 @@ var _ = Describe("Tracing", func() { var keyTypes []string for _, entry := range entries { Expect(entry.Time).To(BeTemporally("~", time.Now(), scaleDuration(10*time.Millisecond))) - Expect(entry.Name).To(Equal("security:key_retired")) + Expect(entry.Name).To(Equal("security:key_discarded")) ev := entry.Event Expect(ev).To(HaveKeyWithValue("trigger", "tls")) Expect(ev).To(HaveKey("key_type")) @@ -773,7 +773,7 @@ var _ = Describe("Tracing", func() { Expect(entries).To(HaveLen(1)) entry := entries[0] Expect(entry.Time).To(BeTemporally("~", time.Now(), scaleDuration(10*time.Millisecond))) - Expect(entry.Name).To(Equal("security:key_retired")) + Expect(entry.Name).To(Equal("security:key_discarded")) ev := entry.Event Expect(ev).To(HaveKeyWithValue("trigger", "tls")) Expect(ev).To(HaveKeyWithValue("key_type", "server_0rtt_secret")) @@ -786,7 +786,7 @@ var _ = Describe("Tracing", func() { var keyTypes []string for _, entry := range entries { Expect(entry.Time).To(BeTemporally("~", time.Now(), scaleDuration(10*time.Millisecond))) - Expect(entry.Name).To(Equal("security:key_retired")) + Expect(entry.Name).To(Equal("security:key_discarded")) ev := entry.Event Expect(ev).To(HaveKeyWithValue("generation", float64(42))) Expect(ev).ToNot(HaveKey("trigger"))