forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: replace logfmt-handler with slog-native text handler

Browse source
This commit is contained in:
Martin Holst Swende 2023-12-04 12:06:19 +01:00
parent 77ebea5f6d
commit 6e51b148c1
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
3 changed files with 54 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/geth/logging_test.go
View file

@ -62,7 +62,7 @@ func censor(input string, start, end int) string {
func TestLogging(t *testing.T) {
t.Parallel()
testConsoleLogging(t, "terminal", 6, 24)
testConsoleLogging(t, "logfmt", 2, 26)
testConsoleLogging(t, "logfmt", 5, 34)
}
func testConsoleLogging(t *testing.T, format string, tStart, tEnd int) {

104
cmd/geth/testdata/logging/logtest-logfmt.txt vendored
View file

@ -1,52 +1,52 @@
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=big.Int 111,222,333,444,555,678,999=111222333444555678999
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=-big.Int -111,222,333,444,555,678,999=-111222333444555678999
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=big.Int 11,122,233,344,455,567,899,900=11122233344455567899900
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=-big.Int -11,122,233,344,455,567,899,900=-11122233344455567899900
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=uint256 111,222,333,444,555,678,999=111222333444555678999
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=uint256 11,122,233,344,455,567,899,900=11122233344455567899900
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=int64 1,000,000=1000000
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=int64 -1,000,000=-1000000
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=int64 9,223,372,036,854,775,807=9223372036854775807
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=int64 -9,223,372,036,854,775,808=-9223372036854775808
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=uint64 1,000,000=1000000
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=uint64 18,446,744,073,709,551,615=18446744073709551615
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Special chars in value" key="special \r\n\t chars"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Special chars in key" "special \n\t chars"=value
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=nospace nospace=nospace
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="with space" "with nospace"="with nospace"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Bash escapes in value" key="\x1b[1G\x1b[K\x1b[1A"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Bash escapes in key" "\x1b[1G\x1b[K\x1b[1A"=value
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Bash escapes in message \x1b[1G\x1b[K\x1b[1A end" key=value
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="\x1b[35mColored\x1b[0m[" "\x1b[35mColored\x1b[0m["="\x1b[35mColored\x1b[0m["
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="an error message with quotes" error="this is an 'error'"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Custom Stringer value" 2562047h47m16.854s=2562047h47m16.854s
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="a custom stringer that emits quoted text" output="output with 'quotes'"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="A message with wonky 💩 characters"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="A multiline message \nINFO [10-18|14:11:31.106] with wonky characters 💩"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="A multiline message \nLALA [ZZZZZZZZZZZZZZZZZZ] Actually part of message above"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=boolean true=true false=false
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="repeated-key 1" foo=alpha foo=beta
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="repeated-key 2" xx=short xx=longer
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="log at level info"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=warn msg="log at level warn"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=eror msg="log at level error"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=test bar=short a="aligned left"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=test bar="a long message" a=1
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=test bar=short a="aligned right"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="The following logs should align so that the key-fields make 5 columns"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Inserted known block" number=1012 hash=0x0000000000000000000000000000000000000000000000000000000000001234 txs=200 gas=1123123 other=first
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Inserted new block" number=1 hash=0x0000000000000000000000000000000000000000000000000000000000001235 txs=2 gas=1123 other=second
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Inserted known block" number=99 hash=0x0000000000000000000000000000000000000000000000000000000000012322 txs=10 gas=1 other=third
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=warn msg="Inserted known block" number=1012 hash=0x0000000000000000000000000000000000000000000000000000000000001234 txs=200 gas=99 other=fourth
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=(*big.Int)(nil) <nil>=<nil>
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=(*uint256.Int)(nil) <nil>=<nil>
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=(fmt.Stringer)(nil) res=<nil>
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=nil-concrete-stringer res=<nil>
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="error(nil) " res=<nil>
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=nil-concrete-error res=""
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=nil-custom-struct res=<nil>
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="raw nil" res=<nil>
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg=(*uint64)(nil) res=<nil>
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Using keys 't', 'lvl', 'time', 'level' and 'msg'" t=t time=time lvl=lvl level=level msg=msg
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Odd pair (1 attr)" key=<nil> LOG_ERROR="Normalized odd number of arguments by adding nil"
t=xxxx-xx-xxTxx:xx:xx+xxxx lvl=info msg="Odd pair (3 attr)" key=value key2=<nil> LOG_ERROR="Normalized odd number of arguments by adding nil"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=big.Int 111,222,333,444,555,678,999=111222333444555678999
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=-big.Int -111,222,333,444,555,678,999=-111222333444555678999
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=big.Int 11,122,233,344,455,567,899,900=11122233344455567899900
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=-big.Int -11,122,233,344,455,567,899,900=-11122233344455567899900
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=uint256 111,222,333,444,555,678,999=111222333444555678999
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=uint256 11,122,233,344,455,567,899,900=11122233344455567899900
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=int64 1,000,000=1000000
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=int64 -1,000,000=-1000000
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=int64 9,223,372,036,854,775,807=9223372036854775807
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=int64 -9,223,372,036,854,775,808=-9223372036854775808
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=uint64 1,000,000=1000000
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=uint64 18,446,744,073,709,551,615=18446744073709551615
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Special chars in value" key="special \r\n\t chars"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Special chars in key" "special \n\t chars"=value
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=nospace nospace=nospace
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="with space" "with nospace"="with nospace"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Bash escapes in value" key="\x1b[1G\x1b[K\x1b[1A"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Bash escapes in key" "\x1b[1G\x1b[K\x1b[1A"=value
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Bash escapes in message \x1b[1G\x1b[K\x1b[1A end" key=value
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="\x1b[35mColored\x1b[0m[" "\x1b[35mColored\x1b[0m["="\x1b[35mColored\x1b[0m["
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="an error message with quotes" error="this is an 'error'"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Custom Stringer value" 2562047h47m16.854s=2562047h47m16.854s
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="a custom stringer that emits quoted text" output="output with 'quotes'"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="A message with wonky 💩 characters"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="A multiline message \nINFO [10-18|14:11:31.106] with wonky characters 💩"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="A multiline message \nLALA [ZZZZZZZZZZZZZZZZZZ] Actually part of message above"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=boolean true=true false=false
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="repeated-key 1" foo=alpha foo=beta
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="repeated-key 2" xx=short xx=longer
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="log at level info"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=WARN msg="log at level warn"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=ERROR msg="log at level error"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=test bar=short a="aligned left"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=test bar="a long message" a=1
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=test bar=short a="aligned right"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="The following logs should align so that the key-fields make 5 columns"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Inserted known block" number=1012 hash=0x0000000000000000000000000000000000000000000000000000000000001234 txs=200 gas=1123123 other=first
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Inserted new block" number=1 hash=0x0000000000000000000000000000000000000000000000000000000000001235 txs=2 gas=1123 other=second
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Inserted known block" number=99 hash=0x0000000000000000000000000000000000000000000000000000000000012322 txs=10 gas=1 other=third
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=WARN msg="Inserted known block" number=1012 hash=0x0000000000000000000000000000000000000000000000000000000000001234 txs=200 gas=99 other=fourth
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=(*big.Int)(nil) <nil>=<nil>
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=(*uint256.Int)(nil) <nil>=<nil>
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=(fmt.Stringer)(nil) res=<nil>
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=nil-concrete-stringer res=<nil>
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="error(nil) " res=<nil>
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=nil-concrete-error res=""
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=nil-custom-struct res=<nil>
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="raw nil" res=<nil>
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=(*uint64)(nil) res=<nil>
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Using keys 't', 'lvl', 'time', 'level' and 'msg'" t=t time=time lvl=lvl level=level msg=msg
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Odd pair (1 attr)" key=<nil> LOG_ERROR="Normalized odd number of arguments by adding nil"
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Odd pair (3 attr)" key=value key2=<nil> LOG_ERROR="Normalized odd number of arguments by adding nil"

4
log/handler.go
View file

@ -123,9 +123,7 @@ func JSONHandler(wr io.Writer) slog.Handler {
//
// For more details see: http://godoc.org/github.com/kr/logfmt
func LogfmtHandler(wr io.Writer) slog.Handler {
return slog.NewTextHandler(wr, &slog.HandlerOptions{
ReplaceAttr: builtinReplaceLogfmt,
})
return slog.NewTextHandler(wr, nil)
}
// LogfmtHandlerWithLevel returns the same handler as LogfmtHandler but it only outputs