From ab318cf89f63da69ee305d6c53121b4cd5691203 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Wed, 20 Oct 2021 13:42:45 +0200 Subject: [PATCH] json: enable WithName logging 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. --- staging/src/k8s.io/component-base/logs/json/json.go | 1 + staging/src/k8s.io/component-base/logs/json/json_test.go | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/component-base/logs/json/json.go b/staging/src/k8s.io/component-base/logs/json/json.go index a39a60dcd05..bdbcec71a16 100644 --- a/staging/src/k8s.io/component-base/logs/json/json.go +++ b/staging/src/k8s.io/component-base/logs/json/json.go @@ -43,6 +43,7 @@ func NewJSONLogger(infoStream, errorStream zapcore.WriteSyncer, encoderConfig *z encoderConfig = &zapcore.EncoderConfig{ MessageKey: "msg", CallerKey: "caller", + NameKey: "logger", TimeKey: "ts", EncodeTime: epochMillisTimeEncoder, EncodeDuration: zapcore.StringDurationEncoder, diff --git a/staging/src/k8s.io/component-base/logs/json/json_test.go b/staging/src/k8s.io/component-base/logs/json/json_test.go index 178a42270b8..76082a6309d 100644 --- a/staging/src/k8s.io/component-base/logs/json/json_test.go +++ b/staging/src/k8s.io/component-base/logs/json/json_test.go @@ -61,10 +61,9 @@ func TestZapLoggerInfo(t *testing.T) { keysValues: []interface{}{"duration", time.Duration(5 * time.Second)}, }, { - msg: "test for WithName", - names: []string{"hello", "world"}, - // TODO: log names - format: "{\"ts\":%f,\"caller\":\"json/json_test.go:%d\",\"msg\":\"test for WithName\",\"v\":0}\n", + msg: "test for WithName", + names: []string{"hello", "world"}, + format: "{\"ts\":%f,\"logger\":\"hello.world\",\"caller\":\"json/json_test.go:%d\",\"msg\":\"test for WithName\",\"v\":0}\n", }, }