Skip to content

Commit 130df55

Browse files
committed
chore: update quic-go to v0.56.0
This removes all qLog customisation and relies on the quic-go defaults. There are two changes: 1. We don't do compression anymore. If people want this we can consider enabling it. 2. The prometheus metrics have been removed as they have been removed in quic-go
1 parent d0ecbf9 commit 130df55

File tree

7 files changed

+12
-518
lines changed

7 files changed

+12
-518
lines changed

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ require (
1919
github.com/ipfs/go-datastore v0.8.2
2020
github.com/jackpal/go-nat-pmp v1.0.2
2121
github.com/jbenet/go-temp-err-catcher v0.1.0
22-
github.com/klauspost/compress v1.18.0
2322
github.com/koron/go-ssdp v0.0.6
2423
github.com/libp2p/go-buffer-pool v0.1.0
2524
github.com/libp2p/go-flow-metrics v0.2.0
@@ -52,7 +51,7 @@ require (
5251
github.com/pion/webrtc/v4 v4.1.2
5352
github.com/prometheus/client_golang v1.22.0
5453
github.com/prometheus/client_model v0.6.2
55-
github.com/quic-go/quic-go v0.55.0
54+
github.com/quic-go/quic-go v0.56.0
5655
github.com/quic-go/webtransport-go v0.9.0
5756
github.com/stretchr/testify v1.10.0
5857
go.uber.org/fx v1.24.0
@@ -70,7 +69,6 @@ require (
7069
github.com/beorn7/perks v1.0.1 // indirect
7170
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7271
github.com/davecgh/go-spew v1.1.1 // indirect
73-
github.com/francoispqt/gojay v1.2.13 // indirect
7472
github.com/google/uuid v1.6.0 // indirect
7573
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
7674
github.com/miekg/dns v1.1.66 // indirect

go.sum

Lines changed: 2 additions & 158 deletions
Large diffs are not rendered by default.

p2p/transport/quicreuse/connmgr.go

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
2628
type 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-
170142
func (c *ConnManager) getReuse(network string) (*reuse, error) {
171143
switch network {
172144
case "udp4":

p2p/transport/quicreuse/tracer.go

Lines changed: 0 additions & 94 deletions
This file was deleted.

p2p/transport/quicreuse/tracer_test.go

Lines changed: 0 additions & 68 deletions
This file was deleted.

test-plans/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ require (
1616
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
1717
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
1818
github.com/flynn/noise v1.1.0 // indirect
19-
github.com/francoispqt/gojay v1.2.13 // indirect
2019
github.com/google/uuid v1.6.0 // indirect
2120
github.com/gorilla/websocket v1.5.3 // indirect
2221
github.com/huin/goupnp v1.3.0 // indirect
2322
github.com/ipfs/go-cid v0.5.0 // indirect
2423
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
2524
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
26-
github.com/klauspost/compress v1.18.0 // indirect
2725
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
2826
github.com/koron/go-ssdp v0.0.6 // indirect
2927
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
@@ -75,7 +73,7 @@ require (
7573
github.com/prometheus/common v0.64.0 // indirect
7674
github.com/prometheus/procfs v0.16.1 // indirect
7775
github.com/quic-go/qpack v0.5.1 // indirect
78-
github.com/quic-go/quic-go v0.55.0 // indirect
76+
github.com/quic-go/quic-go v0.56.0 // indirect
7977
github.com/quic-go/webtransport-go v0.9.0 // indirect
8078
github.com/spaolacci/murmur3 v1.1.0 // indirect
8179
github.com/wlynxg/anet v0.0.5 // indirect

0 commit comments

Comments
 (0)