github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add buckets.go to prometheus import allowlsit

Browse Source 
Change-Id: Ifd497f93614536fdcf3bc7d73505d322bf57f123
This commit is contained in:
Han Kang
2022-10-18 11:46:28 -07:00
parent 287738c125
commit 3d3ac6ad72
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/verify-prometheus-imports.sh
View File

@@ -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

16
test/instrumentation/decode_metric.go
View File

@@ -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
}