Merge pull request kubernetes#92917 from maryamklabib/staticcheck_fix

k8s-ci-robot · web-flow · commit d8937faf23be · 2020-08-27T20:15:02.000-07:00
Resolves staticcheck failures for component-base/metrics
diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
@@ -63,7 +63,6 @@ vendor/k8s.io/client-go/rest/watch
 vendor/k8s.io/client-go/restmapper
 vendor/k8s.io/client-go/tools/leaderelection
 vendor/k8s.io/client-go/transport
-vendor/k8s.io/component-base/metrics
 vendor/k8s.io/kubectl/pkg/cmd/get
 vendor/k8s.io/kubectl/pkg/cmd/scale
 vendor/k8s.io/kubectl/pkg/cmd/testing
diff --git a/staging/src/k8s.io/component-base/metrics/metric.go b/staging/src/k8s.io/component-base/metrics/metric.go
@@ -188,9 +188,6 @@ func (c *selfCollector) Collect(ch chan<- prometheus.Metric) {
 // no-op vecs for convenience
 var noopCounterVec = &prometheus.CounterVec{}
 var noopHistogramVec = &prometheus.HistogramVec{}
-
-// lint:ignore U1000 Keep it for future use
-var noopSummaryVec = &prometheus.SummaryVec{}
 var noopGaugeVec = &prometheus.GaugeVec{}
 var noopObserverVec = &noopObserverVector{}
 
diff --git a/staging/src/k8s.io/component-base/metrics/processstarttime.go b/staging/src/k8s.io/component-base/metrics/processstarttime.go
@@ -54,7 +54,7 @@ func getProcessStart() (float64, error) {
 		return 0, err
 	}
 
-	if stat, err := p.NewStat(); err == nil {
+	if stat, err := p.Stat(); err == nil {
 		return stat.StartTime()
 	}
 	return 0, err

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func getProcessStart() (float64, error) {`
`54`	`54`	`return 0, err`
`55`	`55`	`}`
`56`	`56`
`57`		`- if stat, err := p.NewStat(); err == nil {`
	`57`	`+ if stat, err := p.Stat(); err == nil {`
`58`	`58`	`return stat.StartTime()`
`59`	`59`	`}`
`60`	`60`	`return 0, err`