Fix integration tests relied on series being sorted in a particular o…

…rder.

integration/querier_tenant_federation_test.go

@@ -8,6 +8,7 @@ package integration
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"testing"
 	"time"
@@ -154,7 +155,9 @@ func runQuerierTenantFederationTest(t *testing.T, cfg querierTenantFederationCon
 	result, err := c.Query("series_1", now)
 	require.NoError(t, err)
 
-	assert.Equal(t, mergeResults(tenantIDs, expectedVectors), result.(model.Vector))
+	// We don't guarantee series will be sorted in any particular order, so we ensure they're sorted consistently here
+	// to avoid assertion failures.
+	assert.Equal(t, sortVector(mergeResults(tenantIDs, expectedVectors)), sortVector(result.(model.Vector)))
 
 	// query exemplars for all tenants
 	exemplars, err := c.QueryExemplars("series_1", now.Add(-1*time.Hour), now.Add(1*time.Hour))
@@ -195,11 +198,17 @@ func mergeResults(tenantIDs []string, resultsPerTenant []model.Vector) model.Vec
 	var v model.Vector
 	for pos, tenantID := range tenantIDs {
 		for _, r := range resultsPerTenant[pos] {
-			var s model.Sample = *r
+			s := *r
 			s.Metric = r.Metric.Clone()
 			s.Metric[model.LabelName("__tenant_id__")] = model.LabelValue(tenantID)
 			v = append(v, &s)
 		}
 	}
 	return v
 }
+
+func sortVector(vector model.Vector) model.Vector {
+	sort.Sort(vector)
+
+	return vector
+}