github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99855 from hexxdump/master

Browse Source 
Migrating pkg/kubelet/winstats to structured logging
This commit is contained in:
Kubernetes Prow Robot 2021-03-17 00:46:56 -07:00 committed by GitHub
commit 80ff14a47d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubelet/winstats/network_stats.go
View File

@ -109,49 +109,49 @@ func newNetworkCounters() (*networkCounter, error) {
func (n *networkCounter) getData() ([]cadvisorapi.InterfaceStats, error) { func (n *networkCounter) getData() ([]cadvisorapi.InterfaceStats, error) {
packetsReceivedPerSecondData, err := n.packetsReceivedPerSecondCounter.getDataList() packetsReceivedPerSecondData, err := n.packetsReceivedPerSecondCounter.getDataList()
if err != nil { 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 return nil, err
} }
packetsSentPerSecondData, err := n.packetsSentPerSecondCounter.getDataList() packetsSentPerSecondData, err := n.packetsSentPerSecondCounter.getDataList()
if err != nil { 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 return nil, err
} }
bytesReceivedPerSecondData, err := n.bytesReceivedPerSecondCounter.getDataList() bytesReceivedPerSecondData, err := n.bytesReceivedPerSecondCounter.getDataList()
if err != nil { 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 return nil, err
} }
bytesSentPerSecondData, err := n.bytesSentPerSecondCounter.getDataList() bytesSentPerSecondData, err := n.bytesSentPerSecondCounter.getDataList()
if err != nil { 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 return nil, err
} }
packetsReceivedDiscardedData, err := n.packetsReceivedDiscardedCounter.getDataList() packetsReceivedDiscardedData, err := n.packetsReceivedDiscardedCounter.getDataList()
if err != nil { 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 return nil, err
} }
packetsReceivedErrorsData, err := n.packetsReceivedErrorsCounter.getDataList() packetsReceivedErrorsData, err := n.packetsReceivedErrorsCounter.getDataList()
if err != nil { 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 return nil, err
} }
packetsOutboundDiscardedData, err := n.packetsOutboundDiscardedCounter.getDataList() packetsOutboundDiscardedData, err := n.packetsOutboundDiscardedCounter.getDataList()
if err != nil { 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 return nil, err
} }
packetsOutboundErrorsData, err := n.packetsOutboundErrorsCounter.getDataList() packetsOutboundErrorsData, err := n.packetsOutboundErrorsCounter.getDataList()
if err != nil { 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 return nil, err
} }

8
pkg/kubelet/winstats/perfcounter_nodestats.go
View File

@ -192,25 +192,25 @@ func (p *perfCounterNodeStatsClient) collectMetricsData(cpuCounter, memWorkingSe
cpuValue, err := cpuCounter.getData() cpuValue, err := cpuCounter.getData()
cpuCores := runtime.NumCPU() cpuCores := runtime.NumCPU()
if err != nil { 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 return
} }
memWorkingSetValue, err := memWorkingSetCounter.getData() memWorkingSetValue, err := memWorkingSetCounter.getData()
if err != nil { 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 return
} }
memCommittedBytesValue, err := memCommittedBytesCounter.getData() memCommittedBytesValue, err := memCommittedBytesCounter.getData()
if err != nil { 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 return
} }
networkAdapterStats, err := networkAdapterCounter.getData() networkAdapterStats, err := networkAdapterCounter.getData()
if err != nil { 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 return
} }