github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-27 13:15:36 +00:00
Code Issues Projects Releases Wiki Activity

json: enable WithName logging

Browse Source 
The name added to a logger via WithName only gets printed when a key is
chosen. "logger" is used as in the zap examples.

This becomes relevant once we support contextual logging. When logging through
klog the name is always empty.
This commit is contained in:
Patrick Ohly
2021-10-20 13:42:45 +02:00
parent 3fe5b3e09d
commit ab318cf89f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/component-base/logs/json/json.go
View File

@@ -43,6 +43,7 @@ func NewJSONLogger(infoStream, errorStream zapcore.WriteSyncer, encoderConfig *z
encoderConfig = &zapcore.EncoderConfig{ encoderConfig = &zapcore.EncoderConfig{
MessageKey: "msg", MessageKey: "msg",
CallerKey: "caller", CallerKey: "caller",
NameKey: "logger",
TimeKey: "ts", TimeKey: "ts",
EncodeTime: epochMillisTimeEncoder, EncodeTime: epochMillisTimeEncoder,
EncodeDuration: zapcore.StringDurationEncoder, EncodeDuration: zapcore.StringDurationEncoder,

7
staging/src/k8s.io/component-base/logs/json/json_test.go
View File

@@ -61,10 +61,9 @@ func TestZapLoggerInfo(t *testing.T) {
keysValues: []interface{}{"duration", time.Duration(5 * time.Second)}, keysValues: []interface{}{"duration", time.Duration(5 * time.Second)},
}, },
{ {
msg: "test for WithName", msg: "test for WithName",
names: []string{"hello", "world"}, names: []string{"hello", "world"},
// TODO: log names format: "{\"ts\":%f,\"logger\":\"hello.world\",\"caller\":\"json/json_test.go:%d\",\"msg\":\"test for WithName\",\"v\":0}\n",
format: "{\"ts\":%f,\"caller\":\"json/json_test.go:%d\",\"msg\":\"test for WithName\",\"v\":0}\n",
}, },
} }