From 2424c7388dc0a3e960bbf0ae5fabd31e9e262829 Mon Sep 17 00:00:00 2001 From: Hussaina Begum Nandyala Date: Fri, 5 Mar 2021 23:46:37 +0530 Subject: [PATCH] Migrating pkg/kubelet/winstats to structured logging Signed-off-by: Hussaina Begum Nandyala --- pkg/kubelet/winstats/network_stats.go | 16 ++++++++-------- pkg/kubelet/winstats/perfcounter_nodestats.go | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/kubelet/winstats/network_stats.go b/pkg/kubelet/winstats/network_stats.go index d3acda6d54e..242269820a9 100644 --- a/pkg/kubelet/winstats/network_stats.go +++ b/pkg/kubelet/winstats/network_stats.go @@ -109,49 +109,49 @@ func newNetworkCounters() (*networkCounter, error) { func (n *networkCounter) getData() ([]cadvisorapi.InterfaceStats, error) { packetsReceivedPerSecondData, err := n.packetsReceivedPerSecondCounter.getDataList() if err != nil { - klog.Errorf("Unable to get packetsReceivedPerSecond perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get packetsReceivedPerSecond perf counter data") return nil, err } packetsSentPerSecondData, err := n.packetsSentPerSecondCounter.getDataList() if err != nil { - klog.Errorf("Unable to get packetsSentPerSecond perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get packetsSentPerSecond perf counter data") return nil, err } bytesReceivedPerSecondData, err := n.bytesReceivedPerSecondCounter.getDataList() if err != nil { - klog.Errorf("Unable to get bytesReceivedPerSecond perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get bytesReceivedPerSecond perf counter data") return nil, err } bytesSentPerSecondData, err := n.bytesSentPerSecondCounter.getDataList() if err != nil { - klog.Errorf("Unable to get bytesSentPerSecond perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get bytesSentPerSecond perf counter data") return nil, err } packetsReceivedDiscardedData, err := n.packetsReceivedDiscardedCounter.getDataList() if err != nil { - klog.Errorf("Unable to get packetsReceivedDiscarded perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get packetsReceivedDiscarded perf counter data") return nil, err } packetsReceivedErrorsData, err := n.packetsReceivedErrorsCounter.getDataList() if err != nil { - klog.Errorf("Unable to get packetsReceivedErrors perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get packetsReceivedErrors perf counter data") return nil, err } packetsOutboundDiscardedData, err := n.packetsOutboundDiscardedCounter.getDataList() if err != nil { - klog.Errorf("Unable to get packetsOutboundDiscarded perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get packetsOutboundDiscarded perf counter data") return nil, err } packetsOutboundErrorsData, err := n.packetsOutboundErrorsCounter.getDataList() if err != nil { - klog.Errorf("Unable to get packetsOutboundErrors perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get packetsOutboundErrors perf counter data") return nil, err } diff --git a/pkg/kubelet/winstats/perfcounter_nodestats.go b/pkg/kubelet/winstats/perfcounter_nodestats.go index 265debf096c..08b181f4dbb 100644 --- a/pkg/kubelet/winstats/perfcounter_nodestats.go +++ b/pkg/kubelet/winstats/perfcounter_nodestats.go @@ -168,25 +168,25 @@ func (p *perfCounterNodeStatsClient) collectMetricsData(cpuCounter, memWorkingSe cpuValue, err := cpuCounter.getData() cpuCores := runtime.NumCPU() if err != nil { - klog.Errorf("Unable to get cpu perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get cpu perf counter data") return } memWorkingSetValue, err := memWorkingSetCounter.getData() if err != nil { - klog.Errorf("Unable to get memWorkingSet perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get memWorkingSet perf counter data") return } memCommittedBytesValue, err := memCommittedBytesCounter.getData() if err != nil { - klog.Errorf("Unable to get memCommittedBytes perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get memCommittedBytes perf counter data") return } networkAdapterStats, err := networkAdapterCounter.getData() if err != nil { - klog.Errorf("Unable to get network adapter perf counter data; err: %v", err) + klog.ErrorS(err, "Unable to get network adapter perf counter data") return }