github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Remove directly reference to Prometheus

Browse Source
This commit is contained in:
RainbowMango 2019-10-29 15:08:16 +08:00
parent d56aaf77b9
commit 4355772bb6
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/instrumentation/decode_metric.go
View File

@ -24,7 +24,6 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/prometheus/client_golang/prometheus"
"k8s.io/component-base/metrics" "k8s.io/component-base/metrics"
) )
@ -209,7 +208,7 @@ func (c *metricDecoder) decodeBuckets(expr ast.Expr) ([]float64, error) {
variableName := v.Sel.String() variableName := v.Sel.String()
importName, ok := v.X.(*ast.Ident) importName, ok := v.X.(*ast.Ident)
if ok && importName.String() == c.prometheusImportName && variableName == "DefBuckets" { if ok && importName.String() == c.prometheusImportName && variableName == "DefBuckets" {
return prometheus.DefBuckets, nil return metrics.DefBuckets, nil
} }
case *ast.CallExpr: case *ast.CallExpr:
se, ok := v.Fun.(*ast.SelectorExpr) se, ok := v.Fun.(*ast.SelectorExpr)
@ -230,9 +229,9 @@ func (c *metricDecoder) decodeBuckets(expr ast.Expr) ([]float64, error) {
} }
switch functionName { switch functionName {
case "LinearBuckets": case "LinearBuckets":
return prometheus.LinearBuckets(firstArg, secondArg, thirdArg), nil return metrics.LinearBuckets(firstArg, secondArg, thirdArg), nil
case "ExponentialBuckets": case "ExponentialBuckets":
return prometheus.ExponentialBuckets(firstArg, secondArg, thirdArg), nil return metrics.ExponentialBuckets(firstArg, secondArg, thirdArg), nil
} }
} }
return nil, newDecodeErrorf(expr, errBuckets) return nil, newDecodeErrorf(expr, errBuckets)

8
test/instrumentation/main_test.go
View File

@ -21,7 +21,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/prometheus/client_golang/prometheus" "k8s.io/component-base/metrics"
) )
const fakeFilename = "testdata/metric.go" const fakeFilename = "testdata/metric.go"
@ -304,7 +304,7 @@ var _ = custom.NewCounter(
metric: metric{ metric: metric{
Name: "histogram", Name: "histogram",
StabilityLevel: "STABLE", StabilityLevel: "STABLE",
Buckets: prometheus.LinearBuckets(1, 1, 3), Buckets: metrics.LinearBuckets(1, 1, 3),
Type: histogramMetricType, Type: histogramMetricType,
}, },
src: ` src: `
@ -324,7 +324,7 @@ var _ = metrics.NewHistogram(
metric: metric{ metric: metric{
Name: "histogram", Name: "histogram",
StabilityLevel: "STABLE", StabilityLevel: "STABLE",
Buckets: prometheus.ExponentialBuckets(1, 2, 3), Buckets: metrics.ExponentialBuckets(1, 2, 3),
Type: histogramMetricType, Type: histogramMetricType,
}, },
src: ` src: `
@ -344,7 +344,7 @@ var _ = metrics.NewHistogram(
metric: metric{ metric: metric{
Name: "histogram", Name: "histogram",
StabilityLevel: "STABLE", StabilityLevel: "STABLE",
Buckets: prometheus.DefBuckets, Buckets: metrics.DefBuckets,
Type: histogramMetricType, Type: histogramMetricType,
}, },
src: ` src: `

4
test/instrumentation/metric.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package main package main
import ( import (
"github.com/prometheus/client_golang/prometheus" "k8s.io/component-base/metrics"
) )
const ( const (
@ -39,7 +39,7 @@ type metric struct {
} }
func (m metric) buildFQName() string { func (m metric) buildFQName() string {
return prometheus.BuildFQName(m.Namespace, m.Subsystem, m.Name) return metrics.BuildFQName(m.Namespace, m.Subsystem, m.Name)
} }
type byFQName []metric type byFQName []metric