github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add duration encoder to structured logger

Browse Source
This commit is contained in:
Ryan Phillips
2021-03-09 09:02:45 -06:00
parent 8a8c267e58
commit 089d8dda12
2 changed files with 8 additions and 2 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

@@ -150,6 +150,7 @@ var encoderConfig = zapcore.EncoderConfig{
TimeKey: "ts", TimeKey: "ts",
EncodeTime: zapcore.EpochMillisTimeEncoder, EncodeTime: zapcore.EpochMillisTimeEncoder,
EncodeDuration: zapcore.StringDurationEncoder,
} }
// NewJSONLogger creates a new json logr.Logger using the given Zap Logger to log. // NewJSONLogger creates a new json logr.Logger using the given Zap Logger to log.

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

@@ -57,6 +57,11 @@ func TestZapLoggerInfo(t *testing.T) {
format: "{\"ts\":%f,\"msg\":\"non-string key argument passed to logging, ignoring all later arguments\",\"v\":0}\n{\"ts\":0.000123,\"msg\":\"test for non-string key argument\",\"v\":0,\"ns\":\"default\",\"podnum\":2}\n", format: "{\"ts\":%f,\"msg\":\"non-string key argument passed to logging, ignoring all later arguments\",\"v\":0}\n{\"ts\":0.000123,\"msg\":\"test for non-string key argument\",\"v\":0,\"ns\":\"default\",\"podnum\":2}\n",
keysValues: []interface{}{"ns", "default", "podnum", 2, 200, "replica", "Running", 10}, keysValues: []interface{}{"ns", "default", "podnum", 2, 200, "replica", "Running", 10},
}, },
{
msg: "test for duration value argument",
format: "{\"ts\":%f,\"msg\":\"test for duration value argument\",\"v\":0,\"duration\":\"5s\"}\n",
keysValues: []interface{}{"duration", time.Duration(5 * time.Second)},
},
} }
for _, data := range testDataInfo { for _, data := range testDataInfo {