Skip to content

Commit 0d0f2ad

Browse files
alanprotalanprot
authored
Removing deprecated pkg/prom1/storage/metric package (#5970)
* Removing deprecated pkg/prom1/storage/metric package Signed-off-by: alanprot <[email protected]> * make lint happy Signed-off-by: alanprot <[email protected]> --------- Signed-off-by: alanprot <[email protected]>
1 parent d220082 commit 0d0f2ad

File tree

9 files changed

+48
-196
lines changed

9 files changed

+48
-196
lines changed

‎pkg/distributor/distributor.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"github.com/cortexproject/cortex/pkg/cortexpb"
3030
"github.com/cortexproject/cortex/pkg/ha"
3131
ingester_client "github.com/cortexproject/cortex/pkg/ingester/client"
32-
"github.com/cortexproject/cortex/pkg/prom1/storage/metric"
3332
"github.com/cortexproject/cortex/pkg/ring"
3433
ring_client "github.com/cortexproject/cortex/pkg/ring/client"
3534
"github.com/cortexproject/cortex/pkg/tenant"
@@ -1137,7 +1136,7 @@ func (d *Distributor) LabelNames(ctx context.Context, from, to model.Time) ([]st
11371136
}
11381137

11391138
// MetricsForLabelMatchers gets the metrics that match said matchers
1140-
func (d *Distributor) MetricsForLabelMatchers(ctx context.Context, from, through model.Time, matchers ...*labels.Matcher) ([]metric.Metric, error) {
1139+
func (d *Distributor) MetricsForLabelMatchers(ctx context.Context, from, through model.Time, matchers ...*labels.Matcher) ([]model.Metric, error) {
11411140
return d.metricsForLabelMatchersCommon(ctx, from, through, func(ctx context.Context, rs ring.ReplicationSet, req *ingester_client.MetricsForLabelMatchersRequest, metrics *map[model.Fingerprint]model.Metric, mutex *sync.Mutex, queryLimiter *limiter.QueryLimiter) error {
11421141
_, err := d.ForReplicationSet(ctx, rs, false, func(ctx context.Context, client ingester_client.IngesterClient) (interface{}, error) {
11431142
resp, err := client.MetricsForLabelMatchers(ctx, req)
@@ -1166,7 +1165,7 @@ func (d *Distributor) MetricsForLabelMatchers(ctx context.Context, from, through
11661165
}, matchers...)
11671166
}
11681167

1169-
func (d *Distributor) MetricsForLabelMatchersStream(ctx context.Context, from, through model.Time, matchers ...*labels.Matcher) ([]metric.Metric, error) {
1168+
func (d *Distributor) MetricsForLabelMatchersStream(ctx context.Context, from, through model.Time, matchers ...*labels.Matcher) ([]model.Metric, error) {
11701169
return d.metricsForLabelMatchersCommon(ctx, from, through, func(ctx context.Context, rs ring.ReplicationSet, req *ingester_client.MetricsForLabelMatchersRequest, metrics *map[model.Fingerprint]model.Metric, mutex *sync.Mutex, queryLimiter *limiter.QueryLimiter) error {
11711170
_, err := d.ForReplicationSet(ctx, rs, false, func(ctx context.Context, client ingester_client.IngesterClient) (interface{}, error) {
11721171
stream, err := client.MetricsForLabelMatchersStream(ctx, req)
@@ -1206,7 +1205,7 @@ func (d *Distributor) MetricsForLabelMatchersStream(ctx context.Context, from, t
12061205
}, matchers...)
12071206
}
12081207

1209-
func (d *Distributor) metricsForLabelMatchersCommon(ctx context.Context, from, through model.Time, f func(context.Context, ring.ReplicationSet, *ingester_client.MetricsForLabelMatchersRequest, *map[model.Fingerprint]model.Metric, *sync.Mutex, *limiter.QueryLimiter) error, matchers ...*labels.Matcher) ([]metric.Metric, error) {
1208+
func (d *Distributor) metricsForLabelMatchersCommon(ctx context.Context, from, through model.Time, f func(context.Context, ring.ReplicationSet, *ingester_client.MetricsForLabelMatchersRequest, *map[model.Fingerprint]model.Metric, *sync.Mutex, *limiter.QueryLimiter) error, matchers ...*labels.Matcher) ([]model.Metric, error) {
12101209
replicationSet, err := d.GetIngestersForMetadata(ctx)
12111210
queryLimiter := limiter.QueryLimiterFromContextWithFallback(ctx)
12121211
if err != nil {
@@ -1227,11 +1226,9 @@ func (d *Distributor) metricsForLabelMatchersCommon(ctx context.Context, from, t
12271226
}
12281227

12291228
mutex.Lock()
1230-
result := make([]metric.Metric, 0, len(metrics))
1229+
result := make([]model.Metric, 0, len(metrics))
12311230
for _, m := range metrics {
1232-
result = append(result, metric.Metric{
1233-
Metric: m,
1234-
})
1231+
result = append(result, m)
12351232
}
12361233
mutex.Unlock()
12371234
return result, nil

‎pkg/distributor/distributor_test.go

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"github.com/cortexproject/cortex/pkg/ha"
3838
"github.com/cortexproject/cortex/pkg/ingester"
3939
"github.com/cortexproject/cortex/pkg/ingester/client"
40-
"github.com/cortexproject/cortex/pkg/prom1/storage/metric"
4140
"github.com/cortexproject/cortex/pkg/ring"
4241
ring_client "github.com/cortexproject/cortex/pkg/ring/client"
4342
"github.com/cortexproject/cortex/pkg/ring/kv"
@@ -2161,7 +2160,7 @@ func TestDistributor_MetricsForLabelMatchers(t *testing.T) {
21612160
shuffleShardEnabled bool
21622161
shuffleShardSize int
21632162
matchers []*labels.Matcher
2164-
expectedResult []metric.Metric
2163+
expectedResult []model.Metric
21652164
expectedIngesters int
21662165
queryLimiter *limiter.QueryLimiter
21672166
expectedErr error
@@ -2170,7 +2169,7 @@ func TestDistributor_MetricsForLabelMatchers(t *testing.T) {
21702169
matchers: []*labels.Matcher{
21712170
mustNewMatcher(labels.MatchEqual, model.MetricNameLabel, "unknown"),
21722171
},
2173-
expectedResult: []metric.Metric{},
2172+
expectedResult: []model.Metric{},
21742173
expectedIngesters: numIngesters,
21752174
queryLimiter: limiter.NewQueryLimiter(0, 0, 0, 0),
21762175
expectedErr: nil,
@@ -2179,9 +2178,9 @@ func TestDistributor_MetricsForLabelMatchers(t *testing.T) {
21792178
matchers: []*labels.Matcher{
21802179
mustNewMatcher(labels.MatchEqual, model.MetricNameLabel, "test_1"),
21812180
},
2182-
expectedResult: []metric.Metric{
2183-
{Metric: util.LabelsToMetric(fixtures[0].lbls)},
2184-
{Metric: util.LabelsToMetric(fixtures[1].lbls)},
2181+
expectedResult: []model.Metric{
2182+
util.LabelsToMetric(fixtures[0].lbls),
2183+
util.LabelsToMetric(fixtures[1].lbls),
21852184
},
21862185
expectedIngesters: numIngesters,
21872186
queryLimiter: limiter.NewQueryLimiter(0, 0, 0, 0),
@@ -2192,8 +2191,8 @@ func TestDistributor_MetricsForLabelMatchers(t *testing.T) {
21922191
mustNewMatcher(labels.MatchEqual, "status", "200"),
21932192
mustNewMatcher(labels.MatchEqual, model.MetricNameLabel, "test_1"),
21942193
},
2195-
expectedResult: []metric.Metric{
2196-
{Metric: util.LabelsToMetric(fixtures[0].lbls)},
2194+
expectedResult: []model.Metric{
2195+
util.LabelsToMetric(fixtures[0].lbls),
21972196
},
21982197
expectedIngesters: numIngesters,
21992198
queryLimiter: limiter.NewQueryLimiter(0, 0, 0, 0),
@@ -2203,9 +2202,9 @@ func TestDistributor_MetricsForLabelMatchers(t *testing.T) {
22032202
matchers: []*labels.Matcher{
22042203
mustNewMatcher(labels.MatchEqual, model.MetricNameLabel, "fast_fingerprint_collision"),
22052204
},
2206-
expectedResult: []metric.Metric{
2207-
{Metric: util.LabelsToMetric(fixtures[3].lbls)},
2208-
{Metric: util.LabelsToMetric(fixtures[4].lbls)},
2205+
expectedResult: []model.Metric{
2206+
util.LabelsToMetric(fixtures[3].lbls),
2207+
util.LabelsToMetric(fixtures[4].lbls),
22092208
},
22102209
expectedIngesters: numIngesters,
22112210
queryLimiter: limiter.NewQueryLimiter(0, 0, 0, 0),
@@ -2217,9 +2216,9 @@ func TestDistributor_MetricsForLabelMatchers(t *testing.T) {
22172216
matchers: []*labels.Matcher{
22182217
mustNewMatcher(labels.MatchEqual, model.MetricNameLabel, "test_1"),
22192218
},
2220-
expectedResult: []metric.Metric{
2221-
{Metric: util.LabelsToMetric(fixtures[0].lbls)},
2222-
{Metric: util.LabelsToMetric(fixtures[1].lbls)},
2219+
expectedResult: []model.Metric{
2220+
util.LabelsToMetric(fixtures[0].lbls),
2221+
util.LabelsToMetric(fixtures[1].lbls),
22232222
},
22242223
expectedIngesters: 3,
22252224
queryLimiter: limiter.NewQueryLimiter(0, 0, 0, 0),
@@ -2231,9 +2230,9 @@ func TestDistributor_MetricsForLabelMatchers(t *testing.T) {
22312230
matchers: []*labels.Matcher{
22322231
mustNewMatcher(labels.MatchEqual, model.MetricNameLabel, "test_1"),
22332232
},
2234-
expectedResult: []metric.Metric{
2235-
{Metric: util.LabelsToMetric(fixtures[0].lbls)},
2236-
{Metric: util.LabelsToMetric(fixtures[1].lbls)},
2233+
expectedResult: []model.Metric{
2234+
util.LabelsToMetric(fixtures[0].lbls),
2235+
util.LabelsToMetric(fixtures[1].lbls),
22372236
},
22382237
expectedIngesters: numIngesters,
22392238
queryLimiter: limiter.NewQueryLimiter(0, 0, 0, 0),
@@ -2265,8 +2264,8 @@ func TestDistributor_MetricsForLabelMatchers(t *testing.T) {
22652264
matchers: []*labels.Matcher{
22662265
mustNewMatcher(labels.MatchEqual, model.MetricNameLabel, "test_2"),
22672266
},
2268-
expectedResult: []metric.Metric{
2269-
{Metric: util.LabelsToMetric(fixtures[2].lbls)},
2267+
expectedResult: []model.Metric{
2268+
util.LabelsToMetric(fixtures[2].lbls),
22702269
},
22712270
expectedIngesters: numIngesters,
22722271
queryLimiter: limiter.NewQueryLimiter(1, 0, 0, 0),

‎pkg/prom1/storage/metric/metric.go

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎pkg/prom1/storage/metric/metric_test.go

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎pkg/querier/distributor_queryable.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616

1717
"github.com/cortexproject/cortex/pkg/cortexpb"
1818
"github.com/cortexproject/cortex/pkg/ingester/client"
19-
"github.com/cortexproject/cortex/pkg/prom1/storage/metric"
2019
"github.com/cortexproject/cortex/pkg/querier/series"
2120
"github.com/cortexproject/cortex/pkg/util"
2221
"github.com/cortexproject/cortex/pkg/util/chunkcompat"
@@ -32,8 +31,8 @@ type Distributor interface {
3231
LabelValuesForLabelNameStream(ctx context.Context, from, to model.Time, label model.LabelName, matchers ...*labels.Matcher) ([]string, error)
3332
LabelNames(context.Context, model.Time, model.Time) ([]string, error)
3433
LabelNamesStream(context.Context, model.Time, model.Time) ([]string, error)
35-
MetricsForLabelMatchers(ctx context.Context, from, through model.Time, matchers ...*labels.Matcher) ([]metric.Metric, error)
36-
MetricsForLabelMatchersStream(ctx context.Context, from, through model.Time, matchers ...*labels.Matcher) ([]metric.Metric, error)
34+
MetricsForLabelMatchers(ctx context.Context, from, through model.Time, matchers ...*labels.Matcher) ([]model.Metric, error)
35+
MetricsForLabelMatchersStream(ctx context.Context, from, through model.Time, matchers ...*labels.Matcher) ([]model.Metric, error)
3736
MetricsMetadata(ctx context.Context) ([]scrape.MetricMetadata, error)
3837
}
3938

@@ -123,7 +122,7 @@ func (q *distributorQuerier) Select(ctx context.Context, sortSeries bool, sp *st
123122
// See: https://github.com/prometheus/prometheus/pull/8050
124123
if sp != nil && sp.Func == "series" {
125124
var (
126-
ms []metric.Metric
125+
ms []model.Metric
127126
err error
128127
)
129128

@@ -234,7 +233,7 @@ func (q *distributorQuerier) labelNamesWithMatchers(ctx context.Context, matcher
234233
defer log.Span.Finish()
235234

236235
var (
237-
ms []metric.Metric
236+
ms []model.Metric
238237
err error
239238
)
240239

@@ -250,7 +249,7 @@ func (q *distributorQuerier) labelNamesWithMatchers(ctx context.Context, matcher
250249
namesMap := make(map[string]struct{})
251250

252251
for _, m := range ms {
253-
for name := range m.Metric {
252+
for name := range m {
254253
namesMap[string(name)] = struct{}{}
255254
}
256255
}

‎pkg/querier/distributor_queryable_test.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"github.com/cortexproject/cortex/pkg/chunk"
1919
"github.com/cortexproject/cortex/pkg/cortexpb"
2020
"github.com/cortexproject/cortex/pkg/ingester/client"
21-
"github.com/cortexproject/cortex/pkg/prom1/storage/metric"
2221
"github.com/cortexproject/cortex/pkg/querier/batch"
2322
"github.com/cortexproject/cortex/pkg/util"
2423
"github.com/cortexproject/cortex/pkg/util/chunkcompat"
@@ -97,8 +96,8 @@ func TestDistributorQuerier_SelectShouldHonorQueryIngestersWithin(t *testing.T)
9796

9897
distributor := &MockDistributor{}
9998
distributor.On("QueryStream", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&client.QueryStreamResponse{}, nil)
100-
distributor.On("MetricsForLabelMatchers", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]metric.Metric{}, nil)
101-
distributor.On("MetricsForLabelMatchersStream", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]metric.Metric{}, nil)
99+
distributor.On("MetricsForLabelMatchers", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]model.Metric{}, nil)
100+
distributor.On("MetricsForLabelMatchersStream", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]model.Metric{}, nil)
102101

103102
ctx := user.InjectOrgID(context.Background(), "test")
104103
queryable := newDistributorQueryable(distributor, streamingMetadataEnabled, nil, testData.queryIngestersWithin, testData.queryStoreForLabels)
@@ -313,10 +312,10 @@ func TestDistributorQuerier_LabelNames(t *testing.T) {
313312
t.Run("with matchers", func(t *testing.T) {
314313
t.Parallel()
315314

316-
metrics := []metric.Metric{
317-
{Metric: model.Metric{"foo": "bar"}},
318-
{Metric: model.Metric{"job": "baz"}},
319-
{Metric: model.Metric{"job": "baz", "foo": "boom"}},
315+
metrics := []model.Metric{
316+
{"foo": "bar"},
317+
{"job": "baz"},
318+
{"job": "baz", "foo": "boom"},
320319
}
321320
d := &MockDistributor{}
322321
d.On("MetricsForLabelMatchers", mock.Anything, model.Time(mint), model.Time(maxt), someMatchers).

0 commit comments

Comments
 (0)