diff --git a/hack/verify-prometheus-imports.sh b/hack/verify-prometheus-imports.sh index 2ec5eb1204c..36ab12937ef 100755 --- a/hack/verify-prometheus-imports.sh +++ b/hack/verify-prometheus-imports.sh @@ -43,6 +43,7 @@ allowed_prometheus_importers=( ./staging/src/k8s.io/component-base/metrics/prometheusextension/weighted_histogram.go ./staging/src/k8s.io/component-base/metrics/prometheusextension/weighted_histogram_test.go ./staging/src/k8s.io/component-base/metrics/prometheusextension/weighted_histogram_vec.go + ./staging/src/k8s.io/component-base/metrics/buckets.go ./staging/src/k8s.io/component-base/metrics/collector.go ./staging/src/k8s.io/component-base/metrics/collector_test.go ./staging/src/k8s.io/component-base/metrics/counter.go diff --git a/test/instrumentation/decode_metric.go b/test/instrumentation/decode_metric.go index 59104aef239..0e2d913483d 100644 --- a/test/instrumentation/decode_metric.go +++ b/test/instrumentation/decode_metric.go @@ -496,19 +496,15 @@ func (c *metricDecoder) decodeBucketFunctionCall(v *ast.CallExpr) ([]float64, er case "MergeBuckets": merged := []float64{} for _, arg := range v.Args { - cl, ok := arg.(*ast.CompositeLit) - if ok { - fs, err := decodeListOfFloats(cl, cl.Elts) + switch argExpr := arg.(type) { + case *ast.CompositeLit: + fs, err := decodeListOfFloats(argExpr, argExpr.Elts) if err != nil { return nil, err, true } merged = append(merged, fs...) - } else { - v2, ok := arg.(*ast.CallExpr) - if !ok { - return nil, newDecodeErrorf(v2, errBuckets), true - } - se, ok = v2.Fun.(*ast.SelectorExpr) + case *ast.CallExpr: + se, ok = argExpr.Fun.(*ast.SelectorExpr) if ok { functionName := se.Sel.String() functionImport, ok := se.X.(*ast.Ident) @@ -518,7 +514,7 @@ func (c *metricDecoder) decodeBucketFunctionCall(v *ast.CallExpr) ([]float64, er if functionImport.String() != c.kubeMetricsImportName { return nil, newDecodeErrorf(v, errBuckets), true } - firstArg, secondArg, thirdArg, err := decodeBucketArguments(v2) + firstArg, secondArg, thirdArg, err := decodeBucketArguments(argExpr) if err != nil { return nil, err, true }