*: build with stringlabels (#7745)

Signed-off-by: Michael Hoffmann <[email protected]>

.promu.yml

@@ -6,7 +6,10 @@ build:
  binaries:
  - name: thanos
  path: ./cmd/thanos
- flags: -a -tags netgo
+ flags: -a
+ tags:
+ - netgo
+ - stringlabels
  ldflags: |
  -X github.com/prometheus/common/version.Version={{.Version}}
  -X github.com/prometheus/common/version.Revision={{.Revision}}

Makefile

@@ -312,7 +312,7 @@ test: export THANOS_TEST_ALERTMANAGER_PATH= $(ALERTMANAGER)
 test: check-git install-tool-deps
  @echo ">> install thanos GOOPTS=${GOOPTS}"
  @echo ">> running unit tests (without /test/e2e). Do export THANOS_TEST_OBJSTORE_SKIP=GCS,S3,AZURE,SWIFT,COS,ALIYUNOSS,BOS,OCI,OBS if you want to skip e2e tests against all real store buckets. Current value: ${THANOS_TEST_OBJSTORE_SKIP}"
- @go test -race -timeout 15m $(shell go list ./... | grep -v /vendor/ | grep -v /test/e2e);
+ @go test -race -tags stringlabels -timeout 15m $(shell go list ./... | grep -v /vendor/ | grep -v /test/e2e);
 
 .PHONY: test-local
 test-local: ## Runs test excluding tests for ALL object storage integrations.

cmd/thanos/main_test.go

@@ -123,9 +123,9 @@ func TestRegression4960_Deadlock(t *testing.T) {
  id, err = e2eutil.CreateBlock(
  ctx,
  dir,
- []labels.Labels{{{Name: "a", Value: "1"}}},
+ []labels.Labels{labels.FromStrings("a", "1")},
  1, 0, downsample.ResLevel1DownsampleRange+1, // Pass the minimum ResLevel1DownsampleRange check.
- labels.Labels{{Name: "e1", Value: "1"}},
+ labels.FromStrings("e1", "1"),
  downsample.ResLevel0, metadata.NoneFunc)
  testutil.Ok(t, err)
  testutil.Ok(t, block.Upload(ctx, logger, bkt, path.Join(dir, id.String()), metadata.NoneFunc))
@@ -134,9 +134,9 @@ func TestRegression4960_Deadlock(t *testing.T) {
  id2, err = e2eutil.CreateBlock(
  ctx,
  dir,
- []labels.Labels{{{Name: "a", Value: "2"}}},
+ []labels.Labels{labels.FromStrings("a", "2")},
  1, 0, downsample.ResLevel1DownsampleRange+1, // Pass the minimum ResLevel1DownsampleRange check.
- labels.Labels{{Name: "e1", Value: "2"}},
+ labels.FromStrings("e1", "2"),
  downsample.ResLevel0, metadata.NoneFunc)
  testutil.Ok(t, err)
  testutil.Ok(t, block.Upload(ctx, logger, bkt, path.Join(dir, id2.String()), metadata.NoneFunc))
@@ -145,9 +145,9 @@ func TestRegression4960_Deadlock(t *testing.T) {
  id3, err = e2eutil.CreateBlock(
  ctx,
  dir,
- []labels.Labels{{{Name: "a", Value: "2"}}},
+ []labels.Labels{labels.FromStrings("a", "2")},
  1, 0, downsample.ResLevel1DownsampleRange+1, // Pass the minimum ResLevel1DownsampleRange check.
- labels.Labels{{Name: "e1", Value: "2"}},
+ labels.FromStrings("e1", "2"),
  downsample.ResLevel0, metadata.NoneFunc)
  testutil.Ok(t, err)
  testutil.Ok(t, block.Upload(ctx, logger, bkt, path.Join(dir, id3.String()), metadata.NoneFunc))
@@ -185,9 +185,9 @@ func TestCleanupDownsampleCacheFolder(t *testing.T) {
  id, err = e2eutil.CreateBlock(
  ctx,
  dir,
- []labels.Labels{{{Name: "a", Value: "1"}}},
+ []labels.Labels{labels.FromStrings("a", "1")},
  1, 0, downsample.ResLevel1DownsampleRange+1, // Pass the minimum ResLevel1DownsampleRange check.
- labels.Labels{{Name: "e1", Value: "1"}},
+ labels.FromStrings("e1", "1"),
  downsample.ResLevel0, metadata.NoneFunc)
  testutil.Ok(t, err)
  testutil.Ok(t, block.Upload(ctx, logger, bkt, path.Join(dir, id.String()), metadata.NoneFunc))

pkg/api/query/grpc_test.go

@@ -12,6 +12,7 @@ import (
  "github.com/efficientgo/core/testutil"
  "github.com/go-kit/log"
  "github.com/prometheus/client_golang/prometheus"
+ "github.com/prometheus/prometheus/model/labels"
  "github.com/prometheus/prometheus/promql"
  "github.com/prometheus/prometheus/storage"
  "github.com/prometheus/prometheus/util/annotations"
@@ -28,7 +29,7 @@ import (
 func TestGRPCQueryAPIWithQueryPlan(t *testing.T) {
  logger := log.NewNopLogger()
  reg := prometheus.NewRegistry()
- proxy := store.NewProxyStore(logger, reg, func() []store.Client { return nil }, component.Store, nil, 1*time.Minute, store.LazyRetrieval)
+ proxy := store.NewProxyStore(logger, reg, func() []store.Client { return nil }, component.Store, labels.EmptyLabels(), 1*time.Minute, store.LazyRetrieval)
  queryableCreator := query.NewQueryableCreator(logger, reg, proxy, 1, 1*time.Minute)
  lookbackDeltaFunc := func(i int64) time.Duration { return 5 * time.Minute }
  engineFactory := &QueryEngineFactory{
@@ -74,7 +75,7 @@ func TestGRPCQueryAPIWithQueryPlan(t *testing.T) {
 func TestGRPCQueryAPIErrorHandling(t *testing.T) {
  logger := log.NewNopLogger()
  reg := prometheus.NewRegistry()
- proxy := store.NewProxyStore(logger, reg, func() []store.Client { return nil }, component.Store, nil, 1*time.Minute, store.LazyRetrieval)
+ proxy := store.NewProxyStore(logger, reg, func() []store.Client { return nil }, component.Store, labels.EmptyLabels(), 1*time.Minute, store.LazyRetrieval)
  queryableCreator := query.NewQueryableCreator(logger, reg, proxy, 1, 1*time.Minute)
  lookbackDeltaFunc := func(i int64) time.Duration { return 5 * time.Minute }
  tests := []struct {