storage/remote: use t.TempDir instead of ioutil.TempDir on tests (#9811)

Signed-off-by: Matheus Alcantara <matheusssilv97@gmail.com>

storage/remote/queue_manager_test.go

@@ -75,11 +75,7 @@ func TestSampleDelivery(t *testing.T) {
 	// batch timeout case.
 	n := 3
 
-	dir, err := ioutil.TempDir("", "TestSampleDelivery")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	s := NewStorage(nil, nil, nil, dir, defaultFlushDeadline, nil)
 	defer s.Close()
@@ -154,9 +150,7 @@ func TestSampleDelivery(t *testing.T) {
 func TestMetadataDelivery(t *testing.T) {
 	c := NewTestWriteClient()
 
-	dir, err := ioutil.TempDir("", "TestMetadataDelivery")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer os.RemoveAll(dir)
 
 	cfg := config.DefaultQueueConfig
 	mcfg := config.DefaultMetadataConfig
@@ -198,11 +192,7 @@ func TestSampleDeliveryTimeout(t *testing.T) {
 	cfg.MaxShards = 1
 	cfg.BatchSendDeadline = model.Duration(100 * time.Millisecond)
 
-	dir, err := ioutil.TempDir("", "TestSampleDeliveryTimeout")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	metrics := newQueueManagerMetrics(nil, "", "")
 	m := NewQueueManager(metrics, nil, nil, nil, dir, newEWMARate(ewmaWeight, shardUpdateDuration), cfg, mcfg, nil, nil, c, defaultFlushDeadline, newPool(), newHighestTimestampMetric(), nil, false)
@@ -241,11 +231,7 @@ func TestSampleDeliveryOrder(t *testing.T) {
 	c := NewTestWriteClient()
 	c.expectSamples(samples, series)
 
-	dir, err := ioutil.TempDir("", "TestSampleDeliveryOrder")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	cfg := config.DefaultQueueConfig
 	mcfg := config.DefaultMetadataConfig
@@ -265,11 +251,7 @@ func TestShutdown(t *testing.T) {
 	deadline := 1 * time.Second
 	c := NewTestBlockedWriteClient()
 
-	dir, err := ioutil.TempDir("", "TestShutdown")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	cfg := config.DefaultQueueConfig
 	mcfg := config.DefaultMetadataConfig
@@ -308,11 +290,7 @@ func TestSeriesReset(t *testing.T) {
 	numSegments := 4
 	numSeries := 25
 
-	dir, err := ioutil.TempDir("", "TestSeriesReset")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	cfg := config.DefaultQueueConfig
 	mcfg := config.DefaultMetadataConfig
@@ -343,11 +321,7 @@ func TestReshard(t *testing.T) {
 	mcfg := config.DefaultMetadataConfig
 	cfg.MaxShards = 1
 
-	dir, err := ioutil.TempDir("", "TestReshard")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	metrics := newQueueManagerMetrics(nil, "", "")
 	m := NewQueueManager(metrics, nil, nil, nil, dir, newEWMARate(ewmaWeight, shardUpdateDuration), cfg, mcfg, nil, nil, c, defaultFlushDeadline, newPool(), newHighestTimestampMetric(), nil, false)
@@ -740,9 +714,7 @@ func BenchmarkSampleDelivery(b *testing.B) {
 	cfg.BatchSendDeadline = model.Duration(100 * time.Millisecond)
 	cfg.MaxShards = 1
 
-	dir, err := ioutil.TempDir("", "BenchmarkSampleDelivery")
+	dir := b.TempDir()
-	require.NoError(b, err)
-	defer os.RemoveAll(dir)
 
 	metrics := newQueueManagerMetrics(nil, "", "")
 	m := NewQueueManager(metrics, nil, nil, nil, dir, newEWMARate(ewmaWeight, shardUpdateDuration), cfg, mcfg, nil, nil, c, defaultFlushDeadline, newPool(), newHighestTimestampMetric(), nil, false)
@@ -865,11 +837,7 @@ func TestCalculateDesiredShards(t *testing.T) {
 	cfg := config.DefaultQueueConfig
 	mcfg := config.DefaultMetadataConfig
 
-	dir, err := ioutil.TempDir("", "TestCalculateDesiredShards")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	metrics := newQueueManagerMetrics(nil, "", "")
 	samplesIn := newEWMARate(ewmaWeight, shardUpdateDuration)

storage/remote/read_test.go

@@ -15,9 +15,7 @@ package remote
 
 import (
 	"context"
-	"io/ioutil"
 	"net/url"
-	"os"
 	"sort"
 	"testing"
 
@@ -33,9 +31,7 @@ import (
 )
 
 func TestNoDuplicateReadConfigs(t *testing.T) {
-	dir, err := ioutil.TempDir("", "TestNoDuplicateReadConfigs")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer os.RemoveAll(dir)
 
 	cfg1 := config.RemoteReadConfig{
 		Name: "write-1",

storage/remote/storage_test.go

@@ -14,9 +14,7 @@
 package remote
 
 import (
-	"io/ioutil"
 	"net/url"
-	"os"
 	"testing"
 
 	common_config "github.com/prometheus/common/config"
@@ -26,9 +24,7 @@ import (
 )
 
 func TestStorageLifecycle(t *testing.T) {
-	dir, err := ioutil.TempDir("", "TestStorageLifecycle")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer os.RemoveAll(dir)
 
 	s := NewStorage(nil, nil, nil, dir, defaultFlushDeadline, nil)
 	conf := &config.Config{
@@ -60,14 +56,12 @@ func TestStorageLifecycle(t *testing.T) {
 	// make sure remote write has a queue.
 	require.Equal(t, 1, len(s.queryables))
 
-	err = s.Close()
+	err := s.Close()
 	require.NoError(t, err)
 }
 
 func TestUpdateRemoteReadConfigs(t *testing.T) {
-	dir, err := ioutil.TempDir("", "TestUpdateRemoteReadConfigs")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer os.RemoveAll(dir)
 
 	s := NewStorage(nil, nil, nil, dir, defaultFlushDeadline, nil)
 
@@ -83,6 +77,6 @@ func TestUpdateRemoteReadConfigs(t *testing.T) {
 	require.NoError(t, s.ApplyConfig(conf))
 	require.Equal(t, 1, len(s.queryables))
 
-	err = s.Close()
+	err := s.Close()
 	require.NoError(t, err)
 }

storage/remote/write_test.go

@@ -14,9 +14,7 @@
 package remote
 
 import (
-	"io/ioutil"
 	"net/url"
-	"os"
 	"testing"
 	"time"
 
@@ -44,11 +42,7 @@ func testRemoteWriteConfig() *config.RemoteWriteConfig {
 }
 
 func TestNoDuplicateWriteConfigs(t *testing.T) {
-	dir, err := ioutil.TempDir("", "TestNoDuplicateWriteConfigs")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	cfg1 := config.RemoteWriteConfig{
 		Name: "write-1",
@@ -132,11 +126,7 @@ func TestNoDuplicateWriteConfigs(t *testing.T) {
 }
 
 func TestRestartOnNameChange(t *testing.T) {
-	dir, err := ioutil.TempDir("", "TestRestartOnNameChange")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	cfg := testRemoteWriteConfig()
 
@@ -166,11 +156,7 @@ func TestRestartOnNameChange(t *testing.T) {
 }
 
 func TestUpdateWithRegisterer(t *testing.T) {
-	dir, err := ioutil.TempDir("", "TestRestartWithRegisterer")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	s := NewWriteStorage(nil, prometheus.NewRegistry(), dir, time.Millisecond, nil)
 	c1 := &config.RemoteWriteConfig{
@@ -205,16 +191,12 @@ func TestUpdateWithRegisterer(t *testing.T) {
 		require.Equal(t, 10, queue.cfg.MaxShards)
 	}
 
-	err = s.Close()
+	err := s.Close()
 	require.NoError(t, err)
 }
 
 func TestWriteStorageLifecycle(t *testing.T) {
-	dir, err := ioutil.TempDir("", "TestWriteStorageLifecycle")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	s := NewWriteStorage(nil, nil, dir, defaultFlushDeadline, nil)
 	conf := &config.Config{
@@ -226,16 +208,12 @@ func TestWriteStorageLifecycle(t *testing.T) {
 	require.NoError(t, s.ApplyConfig(conf))
 	require.Equal(t, 1, len(s.queues))
 
-	err = s.Close()
+	err := s.Close()
 	require.NoError(t, err)
 }
 
 func TestUpdateExternalLabels(t *testing.T) {
-	dir, err := ioutil.TempDir("", "TestUpdateExternalLabels")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	s := NewWriteStorage(nil, prometheus.NewRegistry(), dir, time.Second, nil)
 
@@ -264,11 +242,7 @@ func TestUpdateExternalLabels(t *testing.T) {
 }
 
 func TestWriteStorageApplyConfigsIdempotent(t *testing.T) {
-	dir, err := ioutil.TempDir("", "TestWriteStorageApplyConfigsIdempotent")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	s := NewWriteStorage(nil, nil, dir, defaultFlushDeadline, nil)
 
@@ -305,11 +279,7 @@ func TestWriteStorageApplyConfigsIdempotent(t *testing.T) {
 }
 
 func TestWriteStorageApplyConfigsPartialUpdate(t *testing.T) {
-	dir, err := ioutil.TempDir("", "TestWriteStorageApplyConfigsPartialUpdate")
+	dir := t.TempDir()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(dir))
-	}()
 
 	s := NewWriteStorage(nil, nil, dir, defaultFlushDeadline, nil)
 
@@ -383,7 +353,7 @@ func TestWriteStorageApplyConfigsPartialUpdate(t *testing.T) {
 	secondClient := s.queues[hashes[1]].client()
 	// Update c1.
 	c1.HTTPClientConfig.BearerToken = "bar"
-	err = s.ApplyConfig(conf)
+	err := s.ApplyConfig(conf)
 	require.NoError(t, err)
 	require.Equal(t, 3, len(s.queues))