Skip to content

Commit 2b304bf

Browse files
朱正浩,Zhu ZhenghaoRainbowMango
authored andcommitted
fix static check failures in component-base/metrics
1 parent bd239d4 commit 2b304bf

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

staging/src/k8s.io/component-base/metrics/metric.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ func (c *selfCollector) Collect(ch chan<- prometheus.Metric) {
188188
// no-op vecs for convenience
189189
var noopCounterVec = &prometheus.CounterVec{}
190190
var noopHistogramVec = &prometheus.HistogramVec{}
191+
192+
// lint:ignore U1000 Keep it for future use
191193
var noopSummaryVec = &prometheus.SummaryVec{}
192194
var noopGaugeVec = &prometheus.GaugeVec{}
193195
var noopObserverVec = &noopObserverVector{}

staging/src/k8s.io/component-base/metrics/registry_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131

3232
var (
3333
v115 = semver.MustParse("1.15.0")
34-
v114 = semver.MustParse("1.14.0")
3534
alphaCounter = NewCounter(
3635
&CounterOpts{
3736
Namespace: "some_namespace",
@@ -240,6 +239,7 @@ func TestShowHiddenMetric(t *testing.T) {
240239
registry.MustRegister(alphaHiddenCounter)
241240

242241
ms, err := registry.Gather()
242+
assert.Nil(t, err, "Gather failed %v", err)
243243
assert.Equalf(t, expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), expectedMetricCount)
244244

245245
showHidden.Store(true)
@@ -257,9 +257,8 @@ func TestShowHiddenMetric(t *testing.T) {
257257
expectedMetricCount = 1
258258

259259
ms, err = registry.Gather()
260-
assert.Equalf(t, expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), expectedMetricCount)
261260
assert.Nil(t, err, "Gather failed %v", err)
262-
261+
assert.Equalf(t, expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), expectedMetricCount)
263262
}
264263

265264
func TestValidateShowHiddenMetricsVersion(t *testing.T) {

0 commit comments

Comments
 (0)