kubernetes-sigs/prometheus-adapter
1
0
Fork 1
mirror of https://github.com/kubernetes-sigs/prometheus-adapter.git synced 2026-04-06 01:38:10 +00:00
Code Issues Projects Releases Packages Activity Actions

Fix out-of-date unit tests

Browse source 
Several of the unit tests were out of date with the interface or type
definitions.  Now that we're running CI, they need to be up to date
(they should have been anyway, but that's a different story).
This commit is contained in:
Solly Ross 2017-06-27 18:00:32 -04:00
parent c1b9a7faab
commit bbf23f18d0
2 changed files with 43 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

50
pkg/custom-provider/metric_namer_test.go
View file

@ -25,6 +25,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"github.com/directxman12/custom-metrics-boilerplate/pkg/provider" "github.com/directxman12/custom-metrics-boilerplate/pkg/provider"
pmodel "github.com/prometheus/common/model"
// install extensions so that our RESTMapper knows about it // install extensions so that our RESTMapper knows about it
_ "k8s.io/client-go/pkg/apis/extensions/install" _ "k8s.io/client-go/pkg/apis/extensions/install"
@ -53,7 +54,7 @@ func TestMetricNamerContainerSeries(t *testing.T) {
{ {
input: prom.Series{ input: prom.Series{
Name: "container_actually_gauge_seconds_total", Name: "container_actually_gauge_seconds_total",
Labels: map[string]string{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"}, Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
}, },
outputMetricName: "actually_gauge", outputMetricName: "actually_gauge",
outputInfo: seriesInfo{ outputInfo: seriesInfo{
@ -65,7 +66,7 @@ func TestMetricNamerContainerSeries(t *testing.T) {
{ {
input: prom.Series{ input: prom.Series{
Name: "container_some_usage", Name: "container_some_usage",
Labels: map[string]string{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"}, Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
}, },
outputMetricName: "some_usage", outputMetricName: "some_usage",
outputInfo: seriesInfo{ outputInfo: seriesInfo{
@ -77,7 +78,7 @@ func TestMetricNamerContainerSeries(t *testing.T) {
{ {
input: prom.Series{ input: prom.Series{
Name: "container_some_count_total", Name: "container_some_count_total",
Labels: map[string]string{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"}, Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
}, },
outputMetricName: "some_count", outputMetricName: "some_count",
outputInfo: seriesInfo{ outputInfo: seriesInfo{
@ -89,7 +90,7 @@ func TestMetricNamerContainerSeries(t *testing.T) {
{ {
input: prom.Series{ input: prom.Series{
Name: "container_some_time_seconds_total", Name: "container_some_time_seconds_total",
Labels: map[string]string{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"}, Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
}, },
outputMetricName: "some_time", outputMetricName: "some_time",
outputInfo: seriesInfo{ outputInfo: seriesInfo{
@ -131,63 +132,63 @@ func TestSeriesRegistry(t *testing.T) {
// container series // container series
{ {
Name: "container_actually_gauge_seconds_total", Name: "container_actually_gauge_seconds_total",
Labels: map[string]string{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"}, Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
}, },
{ {
Name: "container_some_usage", Name: "container_some_usage",
Labels: map[string]string{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"}, Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
}, },
{ {
Name: "container_some_count_total", Name: "container_some_count_total",
Labels: map[string]string{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"}, Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
}, },
{ {
Name: "container_some_time_seconds_total", Name: "container_some_time_seconds_total",
Labels: map[string]string{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"}, Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
}, },
// namespaced series // namespaced series
// a series that should turn into multiple metrics // a series that should turn into multiple metrics
{ {
Name: "ingress_hits_total", Name: "ingress_hits_total",
Labels: map[string]string{"ingress": "someingress", "service": "somesvc", "pod": "backend1", "namespace": "somens"}, Labels: pmodel.LabelSet{"ingress": "someingress", "service": "somesvc", "pod": "backend1", "namespace": "somens"},
}, },
{ {
Name: "ingress_hits_total", Name: "ingress_hits_total",
Labels: map[string]string{"ingress": "someingress", "service": "somesvc", "pod": "backend2", "namespace": "somens"}, Labels: pmodel.LabelSet{"ingress": "someingress", "service": "somesvc", "pod": "backend2", "namespace": "somens"},
}, },
{ {
Name: "service_proxy_packets", Name: "service_proxy_packets",
Labels: map[string]string{"service": "somesvc", "namespace": "somens"}, Labels: pmodel.LabelSet{"service": "somesvc", "namespace": "somens"},
}, },
{ {
Name: "work_queue_wait_seconds_total", Name: "work_queue_wait_seconds_total",
Labels: map[string]string{"deployment": "somedep", "namespace": "somens"}, Labels: pmodel.LabelSet{"deployment": "somedep", "namespace": "somens"},
}, },
// non-namespaced series // non-namespaced series
{ {
Name: "node_gigawatts", Name: "node_gigawatts",
Labels: map[string]string{"node": "somenode"}, Labels: pmodel.LabelSet{"node": "somenode"},
}, },
{ {
Name: "volume_claims_total", Name: "volume_claims_total",
Labels: map[string]string{"persistentvolume": "somepv"}, Labels: pmodel.LabelSet{"persistentvolume": "somepv"},
}, },
{ {
Name: "node_fan_seconds_total", Name: "node_fan_seconds_total",
Labels: map[string]string{"node": "somenode"}, Labels: pmodel.LabelSet{"node": "somenode"},
}, },
// unrelated series // unrelated series
{ {
Name: "admin_coffee_liters_total", Name: "admin_coffee_liters_total",
Labels: map[string]string{"admin": "some-admin"}, Labels: pmodel.LabelSet{"admin": "some-admin"},
}, },
{ {
Name: "admin_unread_emails", Name: "admin_unread_emails",
Labels: map[string]string{"admin": "some-admin"}, Labels: pmodel.LabelSet{"admin": "some-admin"},
}, },
{ {
Name: "admin_reddit_seconds_total", Name: "admin_reddit_seconds_total",
Labels: map[string]string{"admin": "some-admin"}, Labels: pmodel.LabelSet{"admin": "some-admin"},
}, },
} }
@ -203,6 +204,7 @@ func TestSeriesRegistry(t *testing.T) {
expectedKind SeriesType expectedKind SeriesType
expectedQuery string expectedQuery string
expectedGroupBy string
}{ }{
// container metrics // container metrics
{ {
@ -213,6 +215,7 @@ func TestSeriesRegistry(t *testing.T) {
expectedKind: GaugeSeries, expectedKind: GaugeSeries,
expectedQuery: "container_actually_gauge_seconds_total{pod_name=\"somepod\",container_name!=\"POD\",namespace=\"somens\"}", expectedQuery: "container_actually_gauge_seconds_total{pod_name=\"somepod\",container_name!=\"POD\",namespace=\"somens\"}",
expectedGroupBy: "pod_name",
}, },
{ {
title: "container metrics gauge / multiple resource names", title: "container metrics gauge / multiple resource names",
@ -222,6 +225,7 @@ func TestSeriesRegistry(t *testing.T) {
expectedKind: GaugeSeries, expectedKind: GaugeSeries,
expectedQuery: "container_some_usage{pod_name=~\"somepod1|somepod2\",container_name!=\"POD\",namespace=\"somens\"}", expectedQuery: "container_some_usage{pod_name=~\"somepod1|somepod2\",container_name!=\"POD\",namespace=\"somens\"}",
expectedGroupBy: "pod_name",
}, },
{ {
title: "container metrics counter", title: "container metrics counter",
@ -231,6 +235,7 @@ func TestSeriesRegistry(t *testing.T) {
expectedKind: CounterSeries, expectedKind: CounterSeries,
expectedQuery: "container_some_count_total{pod_name=~\"somepod1|somepod2\",container_name!=\"POD\",namespace=\"somens\"}", expectedQuery: "container_some_count_total{pod_name=~\"somepod1|somepod2\",container_name!=\"POD\",namespace=\"somens\"}",
expectedGroupBy: "pod_name",
}, },
{ {
title: "container metrics seconds counter", title: "container metrics seconds counter",
@ -240,6 +245,7 @@ func TestSeriesRegistry(t *testing.T) {
expectedKind: SecondsCounterSeries, expectedKind: SecondsCounterSeries,
expectedQuery: "container_some_time_seconds_total{pod_name=~\"somepod1|somepod2\",container_name!=\"POD\",namespace=\"somens\"}", expectedQuery: "container_some_time_seconds_total{pod_name=~\"somepod1|somepod2\",container_name!=\"POD\",namespace=\"somens\"}",
expectedGroupBy: "pod_name",
}, },
// namespaced metrics // namespaced metrics
{ {
@ -315,13 +321,19 @@ func TestSeriesRegistry(t *testing.T) {
} }
for _, testCase := range testCases { for _, testCase := range testCases {
outputKind, outputQuery, found := registry.QueryForMetric(testCase.info, testCase.namespace, testCase.resourceNames...) outputKind, outputQuery, groupBy, found := registry.QueryForMetric(testCase.info, testCase.namespace, testCase.resourceNames...)
if !assert.True(found, "%s: metric %v should available", testCase.title, testCase.info) { if !assert.True(found, "%s: metric %v should available", testCase.title, testCase.info) {
continue continue
} }
assert.Equal(testCase.expectedKind, outputKind, "%s: metric %v should have had the right series type", testCase.title, testCase.info) assert.Equal(testCase.expectedKind, outputKind, "%s: metric %v should have had the right series type", testCase.title, testCase.info)
assert.Equal(prom.Selector(testCase.expectedQuery), outputQuery, "%s: metric %v should have produced the correct query for %v in namespace %s", testCase.title, testCase.info, testCase.resourceNames, testCase.namespace) assert.Equal(prom.Selector(testCase.expectedQuery), outputQuery, "%s: metric %v should have produced the correct query for %v in namespace %s", testCase.title, testCase.info, testCase.resourceNames, testCase.namespace)
expectedGroupBy := testCase.expectedGroupBy
if expectedGroupBy == "" {
expectedGroupBy = testCase.info.GroupResource.Resource
}
assert.Equal(expectedGroupBy, groupBy, "%s: metric %v should have produced the correct groupBy clause", testCase.title)
} }
allMetrics := registry.ListAllMetrics() allMetrics := registry.ListAllMetrics()

20
pkg/custom-provider/provider_test.go
View file

@ -21,6 +21,7 @@ import (
"sort" "sort"
"time" "time"
"testing" "testing"
"context"
fakedyn "k8s.io/client-go/dynamic/fake" fakedyn "k8s.io/client-go/dynamic/fake"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
@ -50,7 +51,7 @@ type fakePromClient struct {
queryResults map[prom.Selector]prom.QueryResult queryResults map[prom.Selector]prom.QueryResult
} }
func (c *fakePromClient) Series(interval pmodel.Interval, selectors ...prom.Selector) ([]prom.Series, error) { func (c *fakePromClient) Series(_ context.Context, interval pmodel.Interval, selectors ...prom.Selector) ([]prom.Series, error) {
if (interval.Start != 0 && interval.Start < c.acceptibleInterval.Start) || (interval.End != 0 && interval.End > c.acceptibleInterval.End) { if (interval.Start != 0 && interval.Start < c.acceptibleInterval.Start) || (interval.End != 0 && interval.End > c.acceptibleInterval.End) {
return nil, fmt.Errorf("interval [%v, %v] for query is outside range [%v, %v]", interval.Start, interval.End, c.acceptibleInterval.Start, c.acceptibleInterval.End) return nil, fmt.Errorf("interval [%v, %v] for query is outside range [%v, %v]", interval.Start, interval.End, c.acceptibleInterval.Start, c.acceptibleInterval.End)
} }
@ -67,7 +68,7 @@ func (c *fakePromClient) Series(interval pmodel.Interval, selectors ...prom.Sele
return res, nil return res, nil
} }
func (c *fakePromClient) Query(t pmodel.Time, query prom.Selector) (prom.QueryResult, error) { func (c *fakePromClient) Query(_ context.Context, t pmodel.Time, query prom.Selector) (prom.QueryResult, error) {
if t < c.acceptibleInterval.Start || t > c.acceptibleInterval.End { if t < c.acceptibleInterval.Start || t > c.acceptibleInterval.End {
return prom.QueryResult{}, fmt.Errorf("time %v for query is outside range [%v, %v]", t, c.acceptibleInterval.Start, c.acceptibleInterval.End) return prom.QueryResult{}, fmt.Errorf("time %v for query is outside range [%v, %v]", t, c.acceptibleInterval.Start, c.acceptibleInterval.End)
} }
@ -85,6 +86,9 @@ func (c *fakePromClient) Query(t pmodel.Time, query prom.Selector) (prom.QueryRe
Vector: &pmodel.Vector{}, Vector: &pmodel.Vector{},
}, nil }, nil
} }
func (c *fakePromClient) QueryRange(_ context.Context, r prom.Range, query prom.Selector) (prom.QueryResult, error) {
return prom.QueryResult{}, nil
}
func setupPrometheusProvider(t *testing.T) (provider.CustomMetricsProvider, *fakePromClient) { func setupPrometheusProvider(t *testing.T) (provider.CustomMetricsProvider, *fakePromClient) {
fakeProm := &fakePromClient{} fakeProm := &fakePromClient{}
@ -98,29 +102,29 @@ func setupPrometheusProvider(t *testing.T) (provider.CustomMetricsProvider, *fak
containerSel: []prom.Series{ containerSel: []prom.Series{
{ {
Name: "container_actually_gauge_seconds_total", Name: "container_actually_gauge_seconds_total",
Labels: map[string]string{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"}, Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
}, },
{ {
Name: "container_some_usage", Name: "container_some_usage",
Labels: map[string]string{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"}, Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
}, },
}, },
namespacedSel: []prom.Series{ namespacedSel: []prom.Series{
{ {
Name: "ingress_hits_total", Name: "ingress_hits_total",
Labels: map[string]string{"ingress": "someingress", "service": "somesvc", "pod": "backend1", "namespace": "somens"}, Labels: pmodel.LabelSet{"ingress": "someingress", "service": "somesvc", "pod": "backend1", "namespace": "somens"},
}, },
{ {
Name: "ingress_hits_total", Name: "ingress_hits_total",
Labels: map[string]string{"ingress": "someingress", "service": "somesvc", "pod": "backend2", "namespace": "somens"}, Labels: pmodel.LabelSet{"ingress": "someingress", "service": "somesvc", "pod": "backend2", "namespace": "somens"},
}, },
{ {
Name: "service_proxy_packets", Name: "service_proxy_packets",
Labels: map[string]string{"service": "somesvc", "namespace": "somens"}, Labels: pmodel.LabelSet{"service": "somesvc", "namespace": "somens"},
}, },
{ {
Name: "work_queue_wait_seconds_total", Name: "work_queue_wait_seconds_total",
Labels: map[string]string{"deployment": "somedep", "namespace": "somens"}, Labels: pmodel.LabelSet{"deployment": "somedep", "namespace": "somens"},
}, },
}, },
} }