Skip to content

fix tests #286

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
mkusumdb wants to merge 2 commits into
base: db_main
Choose a base branch
from
Open

fix tests #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd6926f
fix tests
mkusumdb Jan 30, 2026
8d7a0b0
receive: fix label ordering in TestReceiveExtractsTenant
mkusumdb Jan 31, 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
14 changes: 9 additions & 5 deletions pkg/receive/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,15 +924,16 @@ func (h *Handler) distributeTimeseriesToReplicas(
for tsIndex, ts := range timeseries {
var tenant = tenantHTTP

if h.splitTenantLabelName != "" {
// Only extract tenant from split label when running as a router.
// Ingestors should use the tenant determined by the router.
if h.splitTenantLabelName != "" && h.receiverMode != IngestorOnly {
lbls := labelpb.ZLabelsToPromLabels(ts.Labels)

tenantLabel := lbls.Get(h.splitTenantLabelName)
if tenantLabel != "" {
tenant = h.splitTenantLabelName + ":" + tenantLabel
} else {
tenant = h.options.DefaultTenantID
}
// If tenant label doesn't exist, keep the tenant from HTTP header (tenantHTTP)
}

for _, rn := range replicas {
Expand Down Expand Up @@ -1017,11 +1018,14 @@ func (h *Handler) sendLocalWrite(
tenantSeriesMapping := map[string][]prompb.TimeSeries{}
for _, ts := range trackedSeries.timeSeries {
var tenant = tenantHTTP
if h.splitTenantLabelName != "" {
// Only extract tenant from split label when running as a router.
// Ingestors should use the tenant determined by the router.
if h.splitTenantLabelName != "" && h.receiverMode != IngestorOnly {
lbls := labelpb.ZLabelsToPromLabels(ts.Labels)
if tnt := lbls.Get(h.splitTenantLabelName); tnt != "" {
tenant = tnt
tenant = h.splitTenantLabelName + ":" + tnt
}
// If tenant label doesn't exist, keep the tenant from HTTP header (tenantHTTP)
}
tenantSeriesMapping[tenant] = append(tenantSeriesMapping[tenant], ts)
}
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/receive_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,8 +1052,8 @@ func TestReceiveExtractsTenant(t *testing.T) {
Timeseries: []prompb.TimeSeries{
{
Labels: []prompb.Label{
{Name: tenantLabelName, Value: "tenant-1"},
{Name: "aa", Value: "bb"},
{Name: tenantLabelName, Value: "tenant-1"},
},
Samples: []prompb.Sample{
{Value: 1, Timestamp: time.Now().UnixMilli()},
Expand All @@ -1063,7 +1063,7 @@ func TestReceiveExtractsTenant(t *testing.T) {
})
}))

testutil.Ok(t, i.WaitSumMetricsWithOptions(e2emon.Equals(0), []string{"prometheus_tsdb_blocks_loaded"}, e2emon.WithLabelMatchers(matchers.MustNewMatcher(matchers.MatchEqual, "tenant", "tenant-1")), e2emon.WaitMissingMetrics()))
testutil.Ok(t, i.WaitSumMetricsWithOptions(e2emon.Equals(0), []string{"prometheus_tsdb_blocks_loaded"}, e2emon.WithLabelMatchers(matchers.MustNewMatcher(matchers.MatchEqual, "tenant", tenantLabelName+":tenant-1")), e2emon.WaitMissingMetrics()))
})

t.Run("tenant label is extracted from one series, default is used for the other one", func(t *testing.T) {
Expand All @@ -1072,8 +1072,8 @@ func TestReceiveExtractsTenant(t *testing.T) {
Timeseries: []prompb.TimeSeries{
{
Labels: []prompb.Label{
{Name: tenantLabelName, Value: "tenant-2"},
{Name: "aa", Value: "bb"},
{Name: tenantLabelName, Value: "tenant-2"},
},
Samples: []prompb.Sample{
{Value: 1, Timestamp: time.Now().UnixMilli()},
Expand Down Expand Up @@ -1101,8 +1101,8 @@ func TestReceiveExtractsTenant(t *testing.T) {
Timeseries: []prompb.TimeSeries{
{
Labels: []prompb.Label{
{Name: tenantLabelName, Value: "tenant-3"},
{Name: "aa", Value: "bb"},
{Name: tenantLabelName, Value: "tenant-3"},
},
Samples: []prompb.Sample{
{Value: 1, Timestamp: time.Now().UnixMilli()},
Expand Down Expand Up @@ -1149,7 +1149,7 @@ func TestReceiveExtractsTenant(t *testing.T) {
}))

testutil.Ok(t, i.WaitSumMetricsWithOptions(e2emon.Equals(0), []string{"prometheus_tsdb_blocks_loaded"}, e2emon.WithLabelMatchers(matchers.MustNewMatcher(matchers.MatchEqual, "tenant", "http-tenant")), e2emon.WaitMissingMetrics()))
testutil.Ok(t, i.WaitSumMetricsWithOptions(e2emon.Equals(0), []string{"prometheus_tsdb_blocks_loaded"}, e2emon.WithLabelMatchers(matchers.MustNewMatcher(matchers.MatchEqual, "tenant", "tenant-3")), e2emon.WaitMissingMetrics()))
testutil.Ok(t, i.WaitSumMetricsWithOptions(e2emon.Equals(0), []string{"prometheus_tsdb_blocks_loaded"}, e2emon.WithLabelMatchers(matchers.MustNewMatcher(matchers.MatchEqual, "tenant", tenantLabelName+":tenant-3")), e2emon.WaitMissingMetrics()))

})
}
Expand Down
Loading