From ce937b1663802bb06577bdf2edde42f1f54a6b66 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sat, 27 Aug 2022 13:09:34 +0300 Subject: [PATCH] use the logging.Null{Connection}Tracer in integration tests --- integrationtests/self/self_suite_test.go | 46 ++---------------------- 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/integrationtests/self/self_suite_test.go b/integrationtests/self/self_suite_test.go index 242f8602d27..6a3e3a33db3 100644 --- a/integrationtests/self/self_suite_test.go +++ b/integrationtests/self/self_suite_test.go @@ -15,7 +15,6 @@ import ( "log" "math/big" mrand "math/rand" - "net" "os" "runtime/pprof" "strconv" @@ -328,6 +327,7 @@ func scaleDuration(d time.Duration) time.Duration { } type tracer struct { + logging.NullTracer createNewConnTracer func() logging.ConnectionTracer } @@ -340,48 +340,6 @@ func newTracer(c func() logging.ConnectionTracer) logging.Tracer { func (t *tracer) TracerForConnection(context.Context, logging.Perspective, logging.ConnectionID) logging.ConnectionTracer { return t.createNewConnTracer() } -func (t *tracer) SentPacket(net.Addr, *logging.Header, logging.ByteCount, []logging.Frame) {} -func (t *tracer) DroppedPacket(net.Addr, logging.PacketType, logging.ByteCount, logging.PacketDropReason) { -} - -type connTracer struct{} - -var _ logging.ConnectionTracer = &connTracer{} - -func (t *connTracer) StartedConnection(local, remote net.Addr, srcConnID, destConnID logging.ConnectionID) { -} - -func (t *connTracer) NegotiatedVersion(chosen logging.VersionNumber, clientVersions, serverVersions []logging.VersionNumber) { -} -func (t *connTracer) ClosedConnection(error) {} -func (t *connTracer) SentTransportParameters(*logging.TransportParameters) {} -func (t *connTracer) ReceivedTransportParameters(*logging.TransportParameters) {} -func (t *connTracer) RestoredTransportParameters(*logging.TransportParameters) {} -func (t *connTracer) SentPacket(hdr *logging.ExtendedHeader, size logging.ByteCount, ack *logging.AckFrame, frames []logging.Frame) { -} -func (t *connTracer) ReceivedVersionNegotiationPacket(*logging.Header, []logging.VersionNumber) {} -func (t *connTracer) ReceivedRetry(*logging.Header) {} -func (t *connTracer) ReceivedPacket(hdr *logging.ExtendedHeader, size logging.ByteCount, frames []logging.Frame) { -} -func (t *connTracer) BufferedPacket(logging.PacketType) {} -func (t *connTracer) DroppedPacket(logging.PacketType, logging.ByteCount, logging.PacketDropReason) {} -func (t *connTracer) UpdatedMetrics(rttStats *logging.RTTStats, cwnd, bytesInFlight logging.ByteCount, packetsInFlight int) { -} - -func (t *connTracer) AcknowledgedPacket(logging.EncryptionLevel, logging.PacketNumber) {} -func (t *connTracer) LostPacket(logging.EncryptionLevel, logging.PacketNumber, logging.PacketLossReason) { -} -func (t *connTracer) UpdatedCongestionState(logging.CongestionState) {} -func (t *connTracer) UpdatedPTOCount(value uint32) {} -func (t *connTracer) UpdatedKeyFromTLS(logging.EncryptionLevel, logging.Perspective) {} -func (t *connTracer) UpdatedKey(generation logging.KeyPhase, remote bool) {} -func (t *connTracer) DroppedEncryptionLevel(logging.EncryptionLevel) {} -func (t *connTracer) DroppedKey(logging.KeyPhase) {} -func (t *connTracer) SetLossTimer(logging.TimerType, logging.EncryptionLevel, time.Time) {} -func (t *connTracer) LossTimerExpired(logging.TimerType, logging.EncryptionLevel) {} -func (t *connTracer) LossTimerCanceled() {} -func (t *connTracer) Debug(string, string) {} -func (t *connTracer) Close() {} type packet struct { time time.Time @@ -390,7 +348,7 @@ type packet struct { } type packetTracer struct { - connTracer + logging.NullConnectionTracer closed chan struct{} sent, rcvd []packet }