@@ -13,16 +13,18 @@ import (
1313 "net"
1414 "sync"
1515
16+ "github.com/libp2p/go-libp2p/gologshim"
1617 "github.com/libp2p/go-netroute"
1718 ma "github.com/multiformats/go-multiaddr"
1819 manet "github.com/multiformats/go-multiaddr/net"
1920 "github.com/prometheus/client_golang/prometheus"
2021 "github.com/quic-go/quic-go"
21- quiclogging "github.com/quic-go/quic-go/logging"
22- quicmetrics "github.com/quic-go/quic-go/metrics"
22+ "github.com/quic-go/quic-go/http3/qlog"
2323 "golang.org/x/time/rate"
2424)
2525
26+ var log = gologshim .Logger ("quicreuse" )
27+
2628type QUICListener interface {
2729 Accept (ctx context.Context ) (* quic.Conn , error )
2830 Close () error
@@ -109,7 +111,8 @@ func NewConnManager(statelessResetKey quic.StatelessResetKey, tokenKey quic.Toke
109111 }
110112
111113 quicConf := quicConfig .Clone ()
112- quicConf .Tracer = cm .getTracer ()
114+ // quic-go takes care of disabling this if QLOGDIR Environment variable isn't present
115+ quicConf .Tracer = qlog .DefaultConnectionTracer
113116 serverConfig := quicConf .Clone ()
114117
115118 cm .clientConfig = quicConf
@@ -136,37 +139,6 @@ func NewConnManager(statelessResetKey quic.StatelessResetKey, tokenKey quic.Toke
136139 return cm , nil
137140}
138141
139- func (c * ConnManager ) getTracer () func (context.Context , quiclogging.Perspective , quic.ConnectionID ) * quiclogging.ConnectionTracer {
140- return func (_ context.Context , p quiclogging.Perspective , ci quic.ConnectionID ) * quiclogging.ConnectionTracer {
141- var promTracer * quiclogging.ConnectionTracer
142- if c .enableMetrics {
143- switch p {
144- case quiclogging .PerspectiveClient :
145- promTracer = quicmetrics .NewClientConnectionTracerWithRegisterer (c .registerer )
146- case quiclogging .PerspectiveServer :
147- promTracer = quicmetrics .NewServerConnectionTracerWithRegisterer (c .registerer )
148- default :
149- log .Error ("invalid logging perspective" , "peer" , p )
150- }
151- }
152- var tracer * quiclogging.ConnectionTracer
153- var tracerDir = c .qlogTracerDir
154- if tracerDir == "" {
155- // Fallback to the global qlogTracerDir
156- tracerDir = qlogTracerDir
157- }
158-
159- if tracerDir != "" {
160- tracer = qloggerForDir (tracerDir , p , ci )
161- if promTracer != nil {
162- tracer = quiclogging .NewMultiplexedConnectionTracer (promTracer ,
163- tracer )
164- }
165- }
166- return tracer
167- }
168- }
169-
170142func (c * ConnManager ) getReuse (network string ) (* reuse , error ) {
171143 switch network {
172144 case "udp4" :
0 commit comments