scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100013 from rphillips/fixes/add_duration_encoder

Browse Source 
add duration encoder to structured logger
This commit is contained in:
Kubernetes Prow Robot
2021-03-09 17:39:32 -08:00
committed by GitHub
parent 410d092d8a 089d8dda12
commit db978e0480
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,8 +148,9 @@ func (l *zapLogger) WithName(name string) logr.Logger {
var encoderConfig = zapcore.EncoderConfig{ var encoderConfig = zapcore.EncoderConfig{
MessageKey: "msg", MessageKey: "msg",
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 {