Merge pull request #99855 from hexxdump/master

Migrating pkg/kubelet/winstats to structured logging
kubernetes · Mar 17, 2021 · 80ff14a · 80ff14a
2 parents 1dce898 + 2424c73
commit 80ff14a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -192,25 +192,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
 	}