Skip to content

Move tests to microservices_mode integration package #7254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
friedrichg wants to merge 3 commits into
base: master
Choose a base branch
from
+808 −765
Open

Move tests to microservices_mode integration package #7254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fade6c3
Move tests to microservices_mode package
friedrichg Feb 9, 2026
aab3765
Move common functions to integration_querier_test.go
friedrichg Feb 9, 2026
b75a3f0
Fix lint
friedrichg Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/test-build-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@ jobs:
- runner: ubuntu-24.04
arch: amd64
tags: integration_querier
- runner: ubuntu-24.04
arch: amd64
tags: integration_querier_microservices_mode
- runner: ubuntu-24.04
arch: amd64
tags: integration_ruler
Expand Down Expand Up @@ -225,6 +228,9 @@ jobs:
- runner: ubuntu-24.04-arm
arch: arm64
tags: integration_querier
- runner: ubuntu-24.04
arch: arm64
tags: integration_querier_microservices_mode
steps:
- name: Upgrade golang
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
Expand Down
259 changes: 259 additions & 0 deletions integration/querier_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,259 @@
package integration

import (
"fmt"
"testing"
"time"

"github.com/prometheus/common/model"
"github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/prompb"
"github.com/stretchr/testify/require"

"github.com/cortexproject/cortex/integration/e2ecortex"
"github.com/cortexproject/cortex/pkg/util"
)

func testMetadataQueriesWithBlocksStorage(
t *testing.T,
c *e2ecortex.Client,
lastSeriesInStorage prompb.TimeSeries,
lastSeriesInIngesterBlocks prompb.TimeSeries,
firstSeriesInIngesterHead prompb.TimeSeries,
blockRangePeriod time.Duration,
) {
var (
lastSeriesInIngesterBlocksName = getMetricName(lastSeriesInIngesterBlocks.Labels)
firstSeriesInIngesterHeadName = getMetricName(firstSeriesInIngesterHead.Labels)
lastSeriesInStorageName = getMetricName(lastSeriesInStorage.Labels)

lastSeriesInStorageTs = util.TimeFromMillis(lastSeriesInStorage.Samples[0].Timestamp)
lastSeriesInIngesterBlocksTs = util.TimeFromMillis(lastSeriesInIngesterBlocks.Samples[0].Timestamp)
firstSeriesInIngesterHeadTs = util.TimeFromMillis(firstSeriesInIngesterHead.Samples[0].Timestamp)
)

type seriesTest struct {
lookup string
ok bool
resp []prompb.Label
}
type labelValuesTest struct {
label string
matches []string
resp []string
}

testCases := map[string]struct {
from time.Time
to time.Time

seriesTests []seriesTest

labelValuesTests []labelValuesTest

labelNames []string
}{
"query metadata entirely inside the head range": {
from: firstSeriesInIngesterHeadTs,
to: firstSeriesInIngesterHeadTs.Add(blockRangePeriod),
seriesTests: []seriesTest{
{
lookup: firstSeriesInIngesterHeadName,
ok: true,
resp: firstSeriesInIngesterHead.Labels,
},
{
lookup: lastSeriesInIngesterBlocksName,
ok: false,
},
{
lookup: lastSeriesInStorageName,
ok: false,
},
},
labelValuesTests: []labelValuesTest{
{
label: labels.MetricName,
resp: []string{firstSeriesInIngesterHeadName},
},
{
label: labels.MetricName,
resp: []string{firstSeriesInIngesterHeadName},
matches: []string{firstSeriesInIngesterHeadName},
},
{
label: labels.MetricName,
resp: []string{},
matches: []string{lastSeriesInStorageName},
},
},
labelNames: []string{labels.MetricName, firstSeriesInIngesterHeadName},
},
"query metadata entirely inside the ingester range but outside the head range": {
from: lastSeriesInIngesterBlocksTs,
to: lastSeriesInIngesterBlocksTs.Add(blockRangePeriod / 2),
seriesTests: []seriesTest{
{
lookup: firstSeriesInIngesterHeadName,
ok: false,
},
{
lookup: lastSeriesInIngesterBlocksName,
ok: true,
resp: lastSeriesInIngesterBlocks.Labels,
},
{
lookup: lastSeriesInStorageName,
ok: false,
},
},
labelValuesTests: []labelValuesTest{
{
label: labels.MetricName,
resp: []string{lastSeriesInIngesterBlocksName},
},

{
label: labels.MetricName,
resp: []string{lastSeriesInIngesterBlocksName},
matches: []string{lastSeriesInIngesterBlocksName},
},
{
label: labels.MetricName,
resp: []string{},
matches: []string{firstSeriesInIngesterHeadName},
},
},
labelNames: []string{labels.MetricName, lastSeriesInIngesterBlocksName},
},
"query metadata partially inside the ingester range": {
from: lastSeriesInStorageTs.Add(-blockRangePeriod),
to: firstSeriesInIngesterHeadTs.Add(blockRangePeriod),
seriesTests: []seriesTest{
{
lookup: firstSeriesInIngesterHeadName,
ok: true,
resp: firstSeriesInIngesterHead.Labels,
},
{
lookup: lastSeriesInIngesterBlocksName,
ok: true,
resp: lastSeriesInIngesterBlocks.Labels,
},
{
lookup: lastSeriesInStorageName,
ok: true,
resp: lastSeriesInStorage.Labels,
},
},
labelValuesTests: []labelValuesTest{
{
label: labels.MetricName,
resp: []string{lastSeriesInStorageName, lastSeriesInIngesterBlocksName, firstSeriesInIngesterHeadName},
},
{
label: labels.MetricName,
resp: []string{lastSeriesInStorageName},
matches: []string{lastSeriesInStorageName},
},
{
label: labels.MetricName,
resp: []string{lastSeriesInIngesterBlocksName},
matches: []string{lastSeriesInIngesterBlocksName},
},
{
label: labels.MetricName,
resp: []string{lastSeriesInStorageName, lastSeriesInIngesterBlocksName},
matches: []string{lastSeriesInStorageName, lastSeriesInIngesterBlocksName},
},
},
labelNames: []string{labels.MetricName, lastSeriesInStorageName, lastSeriesInIngesterBlocksName, firstSeriesInIngesterHeadName},
},
"query metadata entirely outside the ingester range should return the head data as well": {
from: lastSeriesInStorageTs.Add(-2 * blockRangePeriod),
to: lastSeriesInStorageTs,
seriesTests: []seriesTest{
{
lookup: firstSeriesInIngesterHeadName,
ok: true,
resp: firstSeriesInIngesterHead.Labels,
},
{
lookup: lastSeriesInIngesterBlocksName,
ok: false,
},
{
lookup: lastSeriesInStorageName,
ok: true,
resp: lastSeriesInStorage.Labels,
},
},
labelValuesTests: []labelValuesTest{
{
label: labels.MetricName,
resp: []string{lastSeriesInStorageName, firstSeriesInIngesterHeadName},
},
{
label: labels.MetricName,
resp: []string{lastSeriesInStorageName},
matches: []string{lastSeriesInStorageName},
},
{
label: labels.MetricName,
resp: []string{firstSeriesInIngesterHeadName},
matches: []string{firstSeriesInIngesterHeadName},
},
},
labelNames: []string{labels.MetricName, lastSeriesInStorageName, firstSeriesInIngesterHeadName},
},
}

for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
for _, st := range tc.seriesTests {
seriesRes, err := c.Series([]string{st.lookup}, tc.from, tc.to)
require.NoError(t, err)
if st.ok {
require.Equal(t, 1, len(seriesRes))
require.Equal(t, model.LabelSet(prompbLabelsToModelMetric(st.resp)), seriesRes[0])
} else {
require.Equal(t, 0, len(seriesRes))
}
}

for _, lvt := range tc.labelValuesTests {
labelsRes, err := c.LabelValues(lvt.label, tc.from, tc.to, lvt.matches)
require.NoError(t, err)
exp := model.LabelValues{}
for _, val := range lvt.resp {
exp = append(exp, model.LabelValue(val))
}
require.Equal(t, exp, labelsRes)
}

labelNames, err := c.LabelNames(tc.from, tc.to)
require.NoError(t, err)
require.Equal(t, tc.labelNames, labelNames)
})
}
}

func getMetricName(lbls []prompb.Label) string {
for _, lbl := range lbls {
if lbl.Name == labels.MetricName {
return lbl.Value
}
}

panic(fmt.Sprintf("series %v has no metric name", lbls))
}

func prompbLabelsToModelMetric(pbLabels []prompb.Label) model.Metric {
metric := model.Metric{}

for _, l := range pbLabels {
metric[model.LabelName(l.Name)] = model.LabelValue(l.Value)
}

return metric
}
Loading
Loading