Skip to content

Commit 3d3ac6a

Browse files
author
Han Kang
committed
add buckets.go to prometheus import allowlsit
Change-Id: Ifd497f93614536fdcf3bc7d73505d322bf57f123
1 parent 287738c commit 3d3ac6a

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

hack/verify-prometheus-imports.sh

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ allowed_prometheus_importers=(
4343
./staging/src/k8s.io/component-base/metrics/prometheusextension/weighted_histogram.go
4444
./staging/src/k8s.io/component-base/metrics/prometheusextension/weighted_histogram_test.go
4545
./staging/src/k8s.io/component-base/metrics/prometheusextension/weighted_histogram_vec.go
46+
./staging/src/k8s.io/component-base/metrics/buckets.go
4647
./staging/src/k8s.io/component-base/metrics/collector.go
4748
./staging/src/k8s.io/component-base/metrics/collector_test.go
4849
./staging/src/k8s.io/component-base/metrics/counter.go

test/instrumentation/decode_metric.go

+6-10
Original file line numberDiff line numberDiff line change
@@ -496,19 +496,15 @@ func (c *metricDecoder) decodeBucketFunctionCall(v *ast.CallExpr) ([]float64, er
496496
case "MergeBuckets":
497497
merged := []float64{}
498498
for _, arg := range v.Args {
499-
cl, ok := arg.(*ast.CompositeLit)
500-
if ok {
501-
fs, err := decodeListOfFloats(cl, cl.Elts)
499+
switch argExpr := arg.(type) {
500+
case *ast.CompositeLit:
501+
fs, err := decodeListOfFloats(argExpr, argExpr.Elts)
502502
if err != nil {
503503
return nil, err, true
504504
}
505505
merged = append(merged, fs...)
506-
} else {
507-
v2, ok := arg.(*ast.CallExpr)
508-
if !ok {
509-
return nil, newDecodeErrorf(v2, errBuckets), true
510-
}
511-
se, ok = v2.Fun.(*ast.SelectorExpr)
506+
case *ast.CallExpr:
507+
se, ok = argExpr.Fun.(*ast.SelectorExpr)
512508
if ok {
513509
functionName := se.Sel.String()
514510
functionImport, ok := se.X.(*ast.Ident)
@@ -518,7 +514,7 @@ func (c *metricDecoder) decodeBucketFunctionCall(v *ast.CallExpr) ([]float64, er
518514
if functionImport.String() != c.kubeMetricsImportName {
519515
return nil, newDecodeErrorf(v, errBuckets), true
520516
}
521-
firstArg, secondArg, thirdArg, err := decodeBucketArguments(v2)
517+
firstArg, secondArg, thirdArg, err := decodeBucketArguments(argExpr)
522518
if err != nil {
523519
return nil, err, true
524520
}

0 commit comments

Comments
 (0)