From 10e6fa29f11a36d0226e51ecb69965a4b9bef6ac Mon Sep 17 00:00:00 2001 From: Kobayashi Daisuke Date: Wed, 3 Jun 2020 11:13:54 +0900 Subject: [PATCH 1/3] Migrate log to klog.InfoS for staging/src/k8s.io/client-go Kubernetes-commit: ed1b83c6de5ccc62494e7f0e580cd743ad9a5934 --- tools/record/event.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/record/event.go b/tools/record/event.go index 1c186165..0a1b9eea 100644 --- a/tools/record/event.go +++ b/tools/record/event.go @@ -275,7 +275,7 @@ func recordEvent(sink EventSink, event *v1.Event, patch []byte, updateExistingEv func (e *eventBroadcasterImpl) StartLogging(logf func(format string, args ...interface{})) watch.Interface { return e.StartEventWatcher( func(e *v1.Event) { - logf("Event(%#v): type: '%v' reason: '%v' %v", e.InvolvedObject, e.Type, e.Reason, e.Message) + klog.InfoS("Event occurred", "object", klog.KRef(e.InvolvedObject.Namespace, e.InvolvedObject.Name), "kind", e.InvolvedObject.Kind, "apiVersion", e.InvolvedObject.APIVersion, "type", e.Type, "reason", e.Reason, "message", e.Message) }) } From 55768fa31f27c76015408cbed8c5d31f4beeab70 Mon Sep 17 00:00:00 2001 From: Kobayashi Daisuke Date: Tue, 9 Jun 2020 10:10:41 +0900 Subject: [PATCH 2/3] Add an function for Structured Logging function into EventBroatcaster Kubernetes-commit: dcaa8d7126cb711b9b93ef10fa84364dac8a22d3 --- tools/record/event.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/record/event.go b/tools/record/event.go index 0a1b9eea..474bdd79 100644 --- a/tools/record/event.go +++ b/tools/record/event.go @@ -121,6 +121,10 @@ type EventBroadcaster interface { // function. The return value can be ignored or used to stop recording, if desired. StartLogging(logf func(format string, args ...interface{})) watch.Interface + // StartStructuredLogging starts sending events received from this EventBroadcaster to the structured + // logging function. The return value can be ignored or used to stop recording, if desired. + StartStructuredLogging(verbosity int) watch.Interface + // NewRecorder returns an EventRecorder that can be used to send events to this EventBroadcaster // with the event source set to the given event source. NewRecorder(scheme *runtime.Scheme, source v1.EventSource) EventRecorder @@ -275,7 +279,16 @@ func recordEvent(sink EventSink, event *v1.Event, patch []byte, updateExistingEv func (e *eventBroadcasterImpl) StartLogging(logf func(format string, args ...interface{})) watch.Interface { return e.StartEventWatcher( func(e *v1.Event) { - klog.InfoS("Event occurred", "object", klog.KRef(e.InvolvedObject.Namespace, e.InvolvedObject.Name), "kind", e.InvolvedObject.Kind, "apiVersion", e.InvolvedObject.APIVersion, "type", e.Type, "reason", e.Reason, "message", e.Message) + logf("Event(%#v): type: '%v' reason: '%v' %v", e.InvolvedObject, e.Type, e.Reason, e.Message) + }) +} + +// StartStructuredLogging starts sending events received from this EventBroadcaster to the structured logging function. +// The return value can be ignored or used to stop recording, if desired. +func (e *eventBroadcasterImpl) StartStructuredLogging(verbosity int) watch.Interface { + return e.StartEventWatcher( + func(e *v1.Event) { + klog.V(verbosity).InfoS("Event occurred", "object", klog.KRef(e.InvolvedObject.Namespace, e.InvolvedObject.Name), "kind", e.InvolvedObject.Kind, "apiVersion", e.InvolvedObject.APIVersion, "type", e.Type, "reason", e.Reason, "message", e.Message) }) } From b5d419114905a24baf1a9988c55a1ed0a318f80e Mon Sep 17 00:00:00 2001 From: Kobayashi Daisuke Date: Tue, 9 Jun 2020 12:01:45 +0900 Subject: [PATCH 3/3] Replace StartLogging(klog.Infof) with StartStructuredLogging(0) Kubernetes-commit: 4ae11dac2e2cc8594c528a679db5861c0926b514 --- tools/record/event.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/record/event.go b/tools/record/event.go index 474bdd79..fce4410c 100644 --- a/tools/record/event.go +++ b/tools/record/event.go @@ -123,7 +123,7 @@ type EventBroadcaster interface { // StartStructuredLogging starts sending events received from this EventBroadcaster to the structured // logging function. The return value can be ignored or used to stop recording, if desired. - StartStructuredLogging(verbosity int) watch.Interface + StartStructuredLogging(verbosity klog.Level) watch.Interface // NewRecorder returns an EventRecorder that can be used to send events to this EventBroadcaster // with the event source set to the given event source. @@ -285,7 +285,7 @@ func (e *eventBroadcasterImpl) StartLogging(logf func(format string, args ...int // StartStructuredLogging starts sending events received from this EventBroadcaster to the structured logging function. // The return value can be ignored or used to stop recording, if desired. -func (e *eventBroadcasterImpl) StartStructuredLogging(verbosity int) watch.Interface { +func (e *eventBroadcasterImpl) StartStructuredLogging(verbosity klog.Level) watch.Interface { return e.StartEventWatcher( func(e *v1.Event) { klog.V(verbosity).InfoS("Event occurred", "object", klog.KRef(e.InvolvedObject.Namespace, e.InvolvedObject.Name), "kind", e.InvolvedObject.Kind, "apiVersion", e.InvolvedObject.APIVersion, "type", e.Type, "reason", e.Reason, "message", e.Message)