Skip to content

Commit 0decc40

Browse files
committed
chore: switch to go-libp2p gologshim from go-libp2p#3419
wire gologshim to go-log's slog bridge via init() in cmd/ipfs/kubo/start.go update go-libp2p to v0.44.1-0.20251029234611-789d14c6effe see libp2p/go-libp2p#3419
1 parent 7403f84 commit 0decc40

File tree

7 files changed

+21
-9
lines changed

7 files changed

+21
-9
lines changed

cmd/ipfs/kubo/start.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"errors"
99
"fmt"
1010
"io"
11+
"log/slog"
1112
"net"
1213
"net/http"
1314
"os"
@@ -33,6 +34,7 @@ import (
3334
"github.com/ipfs/kubo/repo"
3435
"github.com/ipfs/kubo/repo/fsrepo"
3536
"github.com/ipfs/kubo/tracing"
37+
"github.com/libp2p/go-libp2p/gologshim"
3638
ma "github.com/multiformats/go-multiaddr"
3739
madns "github.com/multiformats/go-multiaddr-dns"
3840
manet "github.com/multiformats/go-multiaddr/net"
@@ -50,6 +52,16 @@ var (
5052
tracer trace.Tracer
5153
)
5254

55+
func init() {
56+
// Wire go-log's slog bridge to go-libp2p's gologshim.
57+
// This ensures go-libp2p logs integrate with go-log's formatting
58+
// and dynamic level control (e.g., `ipfs log level libp2p-swarm debug`).
59+
//
60+
// go-log's init() installs its slog bridge via slog.SetDefault().
61+
// We pass that handler to gologshim so go-libp2p loggers use it.
62+
gologshim.SetDefaultHandler(slog.Default().Handler())
63+
}
64+
5365
// declared as a var for testing purposes.
5466
var dnsResolver = madns.DefaultResolver
5567

docs/examples/kubo-as-a-library/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ replace github.com/ipfs/kubo => ./../../..
99
require (
1010
github.com/ipfs/boxo v0.35.1
1111
github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
12-
github.com/libp2p/go-libp2p v0.44.1-0.20251027235033-ea2c010ece2d
12+
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe
1313
github.com/multiformats/go-multiaddr v0.16.1
1414
)
1515

docs/examples/kubo-as-a-library/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZ
424424
github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
425425
github.com/libp2p/go-flow-metrics v0.3.0 h1:q31zcHUvHnwDO0SHaukewPYgwOBSxtt830uJtUx6784=
426426
github.com/libp2p/go-flow-metrics v0.3.0/go.mod h1:nuhlreIwEguM1IvHAew3ij7A8BMlyHQJ279ao24eZZo=
427-
github.com/libp2p/go-libp2p v0.44.1-0.20251027235033-ea2c010ece2d h1:Qvs1oreO7W7UAboqY402BiYfvBpw+gC70CUW6rv6e+c=
428-
github.com/libp2p/go-libp2p v0.44.1-0.20251027235033-ea2c010ece2d/go.mod h1:NovCojezAt4dnDd4fH048K7PKEqH0UFYYqJRjIIu8zc=
427+
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe h1:KMnEq4uAmK2RDLpblZ+lS8pd0rwjZjjscwmeeRx0V+M=
428+
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe/go.mod h1:NovCojezAt4dnDd4fH048K7PKEqH0UFYYqJRjIIu8zc=
429429
github.com/libp2p/go-libp2p-asn-util v0.4.1 h1:xqL7++IKD9TBFMgnLPZR6/6iYhawHKHl950SO9L6n94=
430430
github.com/libp2p/go-libp2p-asn-util v0.4.1/go.mod h1:d/NI6XZ9qxw67b4e+NgpQexCIiFYJjErASrYW4PFDN8=
431431
github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ require (
5151
github.com/jbenet/go-temp-err-catcher v0.1.0
5252
github.com/julienschmidt/httprouter v1.3.0
5353
github.com/libp2p/go-doh-resolver v0.5.0
54-
github.com/libp2p/go-libp2p v0.44.1-0.20251027235033-ea2c010ece2d
54+
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe
5555
github.com/libp2p/go-libp2p-http v0.5.0
5656
github.com/libp2p/go-libp2p-kad-dht v0.35.2-0.20251025120456-f33906fd2f32
5757
github.com/libp2p/go-libp2p-kbucket v0.8.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,8 @@ github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZ
504504
github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
505505
github.com/libp2p/go-flow-metrics v0.3.0 h1:q31zcHUvHnwDO0SHaukewPYgwOBSxtt830uJtUx6784=
506506
github.com/libp2p/go-flow-metrics v0.3.0/go.mod h1:nuhlreIwEguM1IvHAew3ij7A8BMlyHQJ279ao24eZZo=
507-
github.com/libp2p/go-libp2p v0.44.1-0.20251027235033-ea2c010ece2d h1:Qvs1oreO7W7UAboqY402BiYfvBpw+gC70CUW6rv6e+c=
508-
github.com/libp2p/go-libp2p v0.44.1-0.20251027235033-ea2c010ece2d/go.mod h1:NovCojezAt4dnDd4fH048K7PKEqH0UFYYqJRjIIu8zc=
507+
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe h1:KMnEq4uAmK2RDLpblZ+lS8pd0rwjZjjscwmeeRx0V+M=
508+
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe/go.mod h1:NovCojezAt4dnDd4fH048K7PKEqH0UFYYqJRjIIu8zc=
509509
github.com/libp2p/go-libp2p-asn-util v0.4.1 h1:xqL7++IKD9TBFMgnLPZR6/6iYhawHKHl950SO9L6n94=
510510
github.com/libp2p/go-libp2p-asn-util v0.4.1/go.mod h1:d/NI6XZ9qxw67b4e+NgpQexCIiFYJjErASrYW4PFDN8=
511511
github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=

test/dependencies/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ require (
182182
github.com/libp2p/go-cidranger v1.1.0 // indirect
183183
github.com/libp2p/go-doh-resolver v0.5.0 // indirect
184184
github.com/libp2p/go-flow-metrics v0.3.0 // indirect
185-
github.com/libp2p/go-libp2p v0.44.1-0.20251027235033-ea2c010ece2d // indirect
185+
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe // indirect
186186
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
187187
github.com/libp2p/go-libp2p-kad-dht v0.35.2-0.20251025120456-f33906fd2f32 // indirect
188188
github.com/libp2p/go-libp2p-kbucket v0.8.0 // indirect

test/dependencies/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,8 @@ github.com/libp2p/go-doh-resolver v0.5.0 h1:4h7plVVW+XTS+oUBw2+8KfoM1jF6w8XmO7+s
458458
github.com/libp2p/go-doh-resolver v0.5.0/go.mod h1:aPDxfiD2hNURgd13+hfo29z9IC22fv30ee5iM31RzxU=
459459
github.com/libp2p/go-flow-metrics v0.3.0 h1:q31zcHUvHnwDO0SHaukewPYgwOBSxtt830uJtUx6784=
460460
github.com/libp2p/go-flow-metrics v0.3.0/go.mod h1:nuhlreIwEguM1IvHAew3ij7A8BMlyHQJ279ao24eZZo=
461-
github.com/libp2p/go-libp2p v0.44.1-0.20251027235033-ea2c010ece2d h1:Qvs1oreO7W7UAboqY402BiYfvBpw+gC70CUW6rv6e+c=
462-
github.com/libp2p/go-libp2p v0.44.1-0.20251027235033-ea2c010ece2d/go.mod h1:NovCojezAt4dnDd4fH048K7PKEqH0UFYYqJRjIIu8zc=
461+
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe h1:KMnEq4uAmK2RDLpblZ+lS8pd0rwjZjjscwmeeRx0V+M=
462+
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe/go.mod h1:NovCojezAt4dnDd4fH048K7PKEqH0UFYYqJRjIIu8zc=
463463
github.com/libp2p/go-libp2p-asn-util v0.4.1 h1:xqL7++IKD9TBFMgnLPZR6/6iYhawHKHl950SO9L6n94=
464464
github.com/libp2p/go-libp2p-asn-util v0.4.1/go.mod h1:d/NI6XZ9qxw67b4e+NgpQexCIiFYJjErASrYW4PFDN8=
465465
github.com/libp2p/go-libp2p-kad-dht v0.35.2-0.20251025120456-f33906fd2f32 h1:xZj18PsLD157snR/BFo547jwOkGDH7jZjMEkBDOoD4Q=

0 commit comments

Comments
 (0)