From 15612338e5eb5afad456ffaa01e85b9ae6347c6f Mon Sep 17 00:00:00 2001 From: jialaijun Date: Sun, 31 Jan 2021 17:36:18 +0800 Subject: [PATCH] Migrate pkg/kubelet/metrics logs to structured logging. --- pkg/kubelet/metrics/collectors/log_metrics.go | 2 +- pkg/kubelet/metrics/collectors/resource_metrics.go | 2 +- pkg/kubelet/metrics/metrics.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kubelet/metrics/collectors/log_metrics.go b/pkg/kubelet/metrics/collectors/log_metrics.go index 94a5d356e10..c542c5ba3da 100644 --- a/pkg/kubelet/metrics/collectors/log_metrics.go +++ b/pkg/kubelet/metrics/collectors/log_metrics.go @@ -63,7 +63,7 @@ func (c *logMetricsCollector) DescribeWithStability(ch chan<- *metrics.Desc) { func (c *logMetricsCollector) CollectWithStability(ch chan<- metrics.Metric) { podStats, err := c.podStats() if err != nil { - klog.Errorf("failed to get pod stats: %v", err) + klog.ErrorS(err, "Failed to get pod stats") return } diff --git a/pkg/kubelet/metrics/collectors/resource_metrics.go b/pkg/kubelet/metrics/collectors/resource_metrics.go index 0a98bd85882..057ebfb9518 100644 --- a/pkg/kubelet/metrics/collectors/resource_metrics.go +++ b/pkg/kubelet/metrics/collectors/resource_metrics.go @@ -115,7 +115,7 @@ func (rc *resourceMetricsCollector) CollectWithStability(ch chan<- metrics.Metri statsSummary, err := rc.provider.GetCPUAndMemoryStats() if err != nil { errorCount = 1 - klog.Warningf("Error getting summary for resourceMetric prometheus endpoint: %v", err) + klog.ErrorS(err, "Error getting summary for resourceMetric prometheus endpoint") return } diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go index 5ce9b6788fa..61269fedd40 100644 --- a/pkg/kubelet/metrics/metrics.go +++ b/pkg/kubelet/metrics/metrics.go @@ -467,7 +467,7 @@ func SetAssignedConfig(source *corev1.NodeConfigSource) error { } // clean up the old timeseries (WithLabelValues creates a new one for each distinct label set) if !AssignedConfig.Delete(assignedConfigLabels) { - klog.Warningf("Failed to delete metric for labels %v. This may result in ambiguity from multiple metrics concurrently indicating different assigned configs.", assignedConfigLabels) + klog.InfoS("Failed to delete metric for labels. This may result in ambiguity from multiple metrics concurrently indicating different assigned configs.", "labels", assignedConfigLabels) } // record the new timeseries assignedConfigLabels = labels @@ -489,7 +489,7 @@ func SetActiveConfig(source *corev1.NodeConfigSource) error { } // clean up the old timeseries (WithLabelValues creates a new one for each distinct label set) if !ActiveConfig.Delete(activeConfigLabels) { - klog.Warningf("Failed to delete metric for labels %v. This may result in ambiguity from multiple metrics concurrently indicating different active configs.", activeConfigLabels) + klog.InfoS("Failed to delete metric for labels. This may result in ambiguity from multiple metrics concurrently indicating different active configs.", "labels", activeConfigLabels) } // record the new timeseries activeConfigLabels = labels @@ -511,7 +511,7 @@ func SetLastKnownGoodConfig(source *corev1.NodeConfigSource) error { } // clean up the old timeseries (WithLabelValues creates a new one for each distinct label set) if !LastKnownGoodConfig.Delete(lastKnownGoodConfigLabels) { - klog.Warningf("Failed to delete metric for labels %v. This may result in ambiguity from multiple metrics concurrently indicating different last known good configs.", lastKnownGoodConfigLabels) + klog.InfoS("Failed to delete metric for labels. This may result in ambiguity from multiple metrics concurrently indicating different last known good configs.", "labels", lastKnownGoodConfigLabels) } // record the new timeseries lastKnownGoodConfigLabels = labels