Skip to content

Commit fec2a37

Browse files
lidellidel
committed
chore: go-libp2p 0.45-pre
update to go-libp2p v0.45.0 pre-release (3b3b1fd6) and latest go-log (eea1e41) add documentation for GOLOG_LOG_LABELS and GOLOG_CAPTURE_DEFAULT_SLOG environment variables see libp2p/go-libp2p#3424
1 parent 79f46bb commit fec2a37

7 files changed

Lines changed: 74 additions & 18 deletions

File tree

‎docs/environment-variables.md‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
- [`GOLOG_LOG_FMT`](#golog_log_fmt)
99
- [`GOLOG_FILE`](#golog_file)
1010
- [`GOLOG_OUTPUT`](#golog_output)
11+
- [`GOLOG_LOG_LABELS`](#golog_log_labels)
12+
- [`GOLOG_CAPTURE_DEFAULT_SLOG`](#golog_capture_default_slog)
1113
- [`GOLOG_TRACING_FILE`](#golog_tracing_file)
1214
- [`IPFS_FUSE_DEBUG`](#ipfs_fuse_debug)
1315
- [`YAMUX_DEBUG`](#yamux_debug)
@@ -100,6 +102,60 @@ When stderr and/or stdout options are configured or specified by the `GOLOG_OUTP
100102
- `GOLOG_OUTPUT="stdout"` logs only to stdout
101103
- `GOLOG_OUTPUT="stderr+stdout"` logs to both stderr and stdout
102104

105+
## `GOLOG_LOG_LABELS`
106+
107+
Adds static key-value labels to all log entries. Labels are specified as comma-separated `key=value` pairs.
108+
109+
This is useful for:
110+
- Identifying logs from different instances in aggregated logging systems
111+
- Adding deployment context (datacenter, environment, version)
112+
- Correlating logs across distributed systems
113+
114+
Example:
115+
116+
```console
117+
export GOLOG_LOG_LABELS="app=kubo,dc=us-west-1,instance=node-42"
118+
ipfs daemon
119+
```
120+
121+
Each log entry will include these labels in JSON format:
122+
123+
```json
124+
{
125+
"level": "info",
126+
"ts": "2025-01-05T10:30:00.000Z",
127+
"logger": "core",
128+
"msg": "daemon started",
129+
"app": "kubo",
130+
"dc": "us-west-1",
131+
"instance": "node-42"
132+
}
133+
```
134+
135+
## `GOLOG_CAPTURE_DEFAULT_SLOG`
136+
137+
Controls whether go-log installs its bridge as Go's default slog handler via `slog.SetDefault()`.
138+
139+
When enabled (default), go-log captures logs from:
140+
- Go standard library packages using `log/slog`
141+
- Third-party libraries using `log/slog`
142+
- go-libp2p (which uses slog internally via gologshim)
143+
144+
This allows unified log management where `ipfs log level` commands control both Kubo subsystems and go-libp2p loggers.
145+
146+
To disable the slog bridge:
147+
148+
```console
149+
export GOLOG_CAPTURE_DEFAULT_SLOG="false"
150+
ipfs daemon
151+
```
152+
153+
When disabled, only native go-log loggers will be captured. Libraries using `log/slog` directly will use Go's default handler and won't appear in `ipfs log tail` or respond to `ipfs log level` commands.
154+
155+
Default: `true` (enabled)
156+
157+
For more details, see [go-log's slog integration documentation](https://github.com/ipfs/go-log/blob/master/README.md#slog-integration).
158+
103159
## `GOLOG_TRACING_FILE`
104160

105161
Sets the file to which Kubo sends tracing events. By default, tracing is

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

Lines changed: 2 additions & 2 deletions
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.20251029234611-789d14c6effe
12+
github.com/libp2p/go-libp2p v0.44.1-0.20251104204556-3b3b1fd6e00e
1313
github.com/multiformats/go-multiaddr v0.16.1
1414
)
1515

@@ -93,7 +93,7 @@ require (
9393
github.com/ipfs/go-ipld-format v0.6.3 // indirect
9494
github.com/ipfs/go-ipld-git v0.1.1 // indirect
9595
github.com/ipfs/go-ipld-legacy v0.2.2 // indirect
96-
github.com/ipfs/go-log/v2 v2.8.3-0.20251028000959-dc9bb9f04e8b // indirect
96+
github.com/ipfs/go-log/v2 v2.8.3-0.20251104190326-eea1e4119c49 // indirect
9797
github.com/ipfs/go-metrics-interface v0.3.0 // indirect
9898
github.com/ipfs/go-peertaskqueue v0.8.2 // indirect
9999
github.com/ipfs/go-test v0.2.3 // indirect

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,8 @@ github.com/ipfs/go-ipld-git v0.1.1/go.mod h1:+VyMqF5lMcJh4rwEppV0e6g4nCCHXThLYYD
349349
github.com/ipfs/go-ipld-legacy v0.2.2 h1:DThbqCPVLpWBcGtU23KDLiY2YRZZnTkXQyfz8aOfBkQ=
350350
github.com/ipfs/go-ipld-legacy v0.2.2/go.mod h1:hhkj+b3kG9b2BcUNw8IFYAsfeNo8E3U7eYlWeAOPyDU=
351351
github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
352-
github.com/ipfs/go-log/v2 v2.8.3-0.20251028000959-dc9bb9f04e8b h1:PtG74rADTbq3f5xA62rjmHd4rRq+rV5uM4E+g3y4ZGM=
353-
github.com/ipfs/go-log/v2 v2.8.3-0.20251028000959-dc9bb9f04e8b/go.mod h1:UhIYAwMV7Nb4ZmihUxfIRM2Istw/y9cAk3xaK+4Zs2c=
352+
github.com/ipfs/go-log/v2 v2.8.3-0.20251104190326-eea1e4119c49 h1:IeFkT7voVHOd7KsTTfXlIh4WIV9m7+UYLFuxLp6a5PM=
353+
github.com/ipfs/go-log/v2 v2.8.3-0.20251104190326-eea1e4119c49/go.mod h1:UhIYAwMV7Nb4ZmihUxfIRM2Istw/y9cAk3xaK+4Zs2c=
354354
github.com/ipfs/go-metrics-interface v0.3.0 h1:YwG7/Cy4R94mYDUuwsBfeziJCVm9pBMJ6q/JR9V40TU=
355355
github.com/ipfs/go-metrics-interface v0.3.0/go.mod h1:OxxQjZDGocXVdyTPocns6cOLwHieqej/jos7H4POwoY=
356356
github.com/ipfs/go-peertaskqueue v0.8.2 h1:PaHFRaVFdxQk1Qo3OKiHPYjmmusQy7gKQUaL8JDszAU=
@@ -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.20251029234611-789d14c6effe h1:KMnEq4uAmK2RDLpblZ+lS8pd0rwjZjjscwmeeRx0V+M=
428-
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe/go.mod h1:NovCojezAt4dnDd4fH048K7PKEqH0UFYYqJRjIIu8zc=
427+
github.com/libp2p/go-libp2p v0.44.1-0.20251104204556-3b3b1fd6e00e h1:e2l686j0igVArkat68VgRS+cNkZ9oQNddkK1PfUGTuY=
428+
github.com/libp2p/go-libp2p v0.44.1-0.20251104204556-3b3b1fd6e00e/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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
github.com/ipfs/go-ipld-format v0.6.3
4040
github.com/ipfs/go-ipld-git v0.1.1
4141
github.com/ipfs/go-ipld-legacy v0.2.2
42-
github.com/ipfs/go-log/v2 v2.8.3-0.20251028000959-dc9bb9f04e8b
42+
github.com/ipfs/go-log/v2 v2.8.3-0.20251104190326-eea1e4119c49
4343
github.com/ipfs/go-metrics-interface v0.3.0
4444
github.com/ipfs/go-metrics-prometheus v0.1.0
4545
github.com/ipfs/go-test v0.2.3
@@ -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.20251029234611-789d14c6effe
54+
github.com/libp2p/go-libp2p v0.44.1-0.20251104204556-3b3b1fd6e00e
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ github.com/ipfs/go-ipld-git v0.1.1/go.mod h1:+VyMqF5lMcJh4rwEppV0e6g4nCCHXThLYYD
416416
github.com/ipfs/go-ipld-legacy v0.2.2 h1:DThbqCPVLpWBcGtU23KDLiY2YRZZnTkXQyfz8aOfBkQ=
417417
github.com/ipfs/go-ipld-legacy v0.2.2/go.mod h1:hhkj+b3kG9b2BcUNw8IFYAsfeNo8E3U7eYlWeAOPyDU=
418418
github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
419-
github.com/ipfs/go-log/v2 v2.8.3-0.20251028000959-dc9bb9f04e8b h1:PtG74rADTbq3f5xA62rjmHd4rRq+rV5uM4E+g3y4ZGM=
420-
github.com/ipfs/go-log/v2 v2.8.3-0.20251028000959-dc9bb9f04e8b/go.mod h1:UhIYAwMV7Nb4ZmihUxfIRM2Istw/y9cAk3xaK+4Zs2c=
419+
github.com/ipfs/go-log/v2 v2.8.3-0.20251104190326-eea1e4119c49 h1:IeFkT7voVHOd7KsTTfXlIh4WIV9m7+UYLFuxLp6a5PM=
420+
github.com/ipfs/go-log/v2 v2.8.3-0.20251104190326-eea1e4119c49/go.mod h1:UhIYAwMV7Nb4ZmihUxfIRM2Istw/y9cAk3xaK+4Zs2c=
421421
github.com/ipfs/go-metrics-interface v0.3.0 h1:YwG7/Cy4R94mYDUuwsBfeziJCVm9pBMJ6q/JR9V40TU=
422422
github.com/ipfs/go-metrics-interface v0.3.0/go.mod h1:OxxQjZDGocXVdyTPocns6cOLwHieqej/jos7H4POwoY=
423423
github.com/ipfs/go-metrics-prometheus v0.1.0 h1:bApWOHkrH3VTBHzTHrZSfq4n4weOZDzZFxUXv+HyKcA=
@@ -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.20251029234611-789d14c6effe h1:KMnEq4uAmK2RDLpblZ+lS8pd0rwjZjjscwmeeRx0V+M=
508-
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe/go.mod h1:NovCojezAt4dnDd4fH048K7PKEqH0UFYYqJRjIIu8zc=
507+
github.com/libp2p/go-libp2p v0.44.1-0.20251104204556-3b3b1fd6e00e h1:e2l686j0igVArkat68VgRS+cNkZ9oQNddkK1PfUGTuY=
508+
github.com/libp2p/go-libp2p v0.44.1-0.20251104204556-3b3b1fd6e00e/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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/Kubuxu/gocovmerge v0.0.0-20161216165753-7ecaa51963cd
99
github.com/golangci/golangci-lint v1.64.8
1010
github.com/ipfs/go-cidutil v0.1.0
11-
github.com/ipfs/go-log/v2 v2.8.3-0.20251028000959-dc9bb9f04e8b
11+
github.com/ipfs/go-log/v2 v2.8.3-0.20251104190326-eea1e4119c49
1212
github.com/ipfs/go-test v0.2.3
1313
github.com/ipfs/hang-fds v0.1.0
1414
github.com/ipfs/iptb v1.4.1
@@ -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.20251029234611-789d14c6effe // indirect
185+
github.com/libp2p/go-libp2p v0.44.1-0.20251104204556-3b3b1fd6e00e // 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,8 @@ github.com/ipfs/go-ipld-format v0.6.3 h1:9/lurLDTotJpZSuL++gh3sTdmcFhVkCwsgx2+rA
364364
github.com/ipfs/go-ipld-format v0.6.3/go.mod h1:74ilVN12NXVMIV+SrBAyC05UJRk0jVvGqdmrcYZvCBk=
365365
github.com/ipfs/go-ipld-legacy v0.2.2 h1:DThbqCPVLpWBcGtU23KDLiY2YRZZnTkXQyfz8aOfBkQ=
366366
github.com/ipfs/go-ipld-legacy v0.2.2/go.mod h1:hhkj+b3kG9b2BcUNw8IFYAsfeNo8E3U7eYlWeAOPyDU=
367-
github.com/ipfs/go-log/v2 v2.8.3-0.20251028000959-dc9bb9f04e8b h1:PtG74rADTbq3f5xA62rjmHd4rRq+rV5uM4E+g3y4ZGM=
368-
github.com/ipfs/go-log/v2 v2.8.3-0.20251028000959-dc9bb9f04e8b/go.mod h1:UhIYAwMV7Nb4ZmihUxfIRM2Istw/y9cAk3xaK+4Zs2c=
367+
github.com/ipfs/go-log/v2 v2.8.3-0.20251104190326-eea1e4119c49 h1:IeFkT7voVHOd7KsTTfXlIh4WIV9m7+UYLFuxLp6a5PM=
368+
github.com/ipfs/go-log/v2 v2.8.3-0.20251104190326-eea1e4119c49/go.mod h1:UhIYAwMV7Nb4ZmihUxfIRM2Istw/y9cAk3xaK+4Zs2c=
369369
github.com/ipfs/go-metrics-interface v0.3.0 h1:YwG7/Cy4R94mYDUuwsBfeziJCVm9pBMJ6q/JR9V40TU=
370370
github.com/ipfs/go-metrics-interface v0.3.0/go.mod h1:OxxQjZDGocXVdyTPocns6cOLwHieqej/jos7H4POwoY=
371371
github.com/ipfs/go-peertaskqueue v0.8.2 h1:PaHFRaVFdxQk1Qo3OKiHPYjmmusQy7gKQUaL8JDszAU=
@@ -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.20251029234611-789d14c6effe h1:KMnEq4uAmK2RDLpblZ+lS8pd0rwjZjjscwmeeRx0V+M=
462-
github.com/libp2p/go-libp2p v0.44.1-0.20251029234611-789d14c6effe/go.mod h1:NovCojezAt4dnDd4fH048K7PKEqH0UFYYqJRjIIu8zc=
461+
github.com/libp2p/go-libp2p v0.44.1-0.20251104204556-3b3b1fd6e00e h1:e2l686j0igVArkat68VgRS+cNkZ9oQNddkK1PfUGTuY=
462+
github.com/libp2p/go-libp2p v0.44.1-0.20251104204556-3b3b1fd6e00e/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)