Lint

Author: alanprot

pkg/ingester/active_series.go

@@ -113,15 +113,15 @@ func (s *activeSeriesStripe) updateSeriesTimestamp(now time.Time, series labels.
 
 	if !entryTimeSet {
 		if prev := e.Load(); nowNanos > prev {
-			entryTimeSet = e.CAS(prev, nowNanos)
+			entryTimeSet = e.CompareAndSwap(prev, nowNanos)
 		}
 	}
 
 	if entryTimeSet {
 		for prevOldest := s.oldestEntryTs.Load(); nowNanos < prevOldest; {
 			// If recent purge already removed entries older than "oldest entry timestamp", setting this to 0 will make
 			// sure that next purge doesn't take the shortcut route.
-			if s.oldestEntryTs.CAS(prevOldest, 0) {
+			if s.oldestEntryTs.CompareAndSwap(prevOldest, 0) {
 				break
 			}
 		}

pkg/ingester/active_series_test.go

@@ -60,8 +60,8 @@ func TestActiveSeries_Purge(t *testing.T) {
 
 func TestActiveSeries_PurgeOpt(t *testing.T) {
 	metric := labels.NewBuilder(labels.FromStrings("__name__", "logs"))
-	ls1 := metric.Set("_", "ypfajYg2lsv").Labels()
-	ls2 := metric.Set("_", "KiqbryhzUpn").Labels()
+	ls1 := metric.Set("_", "ypfajYg2lsv").Labels(nil)
+	ls2 := metric.Set("_", "KiqbryhzUpn").Labels(nil)
 
 	c := NewActiveSeries()
 

pkg/querier/querier_test.go

@@ -336,7 +336,7 @@ func mockTSDB(t *testing.T, labels []labels.Labels, mint model.Time, samples int
 	opts := tsdb.DefaultHeadOptions()
 	opts.ChunkDirRoot = t.TempDir()
 	// We use TSDB head only. By using full TSDB DB, and appending samples to it, closing it would cause unnecessary HEAD compaction, which slows down the test.
-	head, err := tsdb.NewHead(nil, nil, nil, opts, nil)
+	head, err := tsdb.NewHead(nil, nil, nil, nil, opts, nil)
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		_ = head.Close()

pkg/storegateway/bucket_stores_test.go

@@ -582,7 +582,7 @@ type failFirstGetBucket struct {
 }
 
 func (f *failFirstGetBucket) Get(ctx context.Context, name string) (io.ReadCloser, error) {
-	if f.firstGet.CAS(false, true) {
+	if f.firstGet.CompareAndSwap(false, true) {
 		return nil, errors.New("Get() request mocked error")
 	}
 

pkg/util/concurrency/runner_test.go

@@ -45,7 +45,7 @@ func TestForEachUser_ShouldContinueOnErrorButReturnIt(t *testing.T) {
 	input := []string{"a", "b", "c"}
 
 	err := ForEachUser(ctx, input, 2, func(ctx context.Context, user string) error {
-		if processed.CAS(0, 1) {
+		if processed.CompareAndSwap(0, 1) {
 			return errors.New("the first request is failing")
 		}
 
@@ -103,7 +103,7 @@ func TestForEach_ShouldBreakOnFirstError_ContextCancellationHandled(t *testing.T
 	)
 
 	err := ForEach(ctx, []interface{}{"a", "b", "c"}, 2, func(ctx context.Context, job interface{}) error {
-		if processed.CAS(0, 1) {
+		if processed.CompareAndSwap(0, 1) {
 			return errors.New("the first request is failing")
 		}
 
@@ -140,7 +140,7 @@ func TestForEach_ShouldBreakOnFirstError_ContextCancellationUnhandled(t *testing
 	err := ForEach(ctx, []interface{}{"a", "b", "c"}, 2, func(ctx context.Context, job interface{}) error {
 		wg.Done()
 
-		if processed.CAS(0, 1) {
+		if processed.CompareAndSwap(0, 1) {
 			// wait till two jobs have been started
 			wg.Wait()
 			return errors.New("the first request is failing")