[chore] use new linter usetesting

.golangci.yml

@@ -216,13 +216,13 @@ linters:
     - reassign
     - revive
     - staticcheck
-    - tenv
     - testifylint
     - thelper
     - unconvert
     - unparam
     - unused
     - usestdlibvars
+    - usetesting
     - wastedassign
     - whitespace
 

cmd/opampsupervisor/supervisor/config/config_test.go

@@ -486,16 +486,15 @@ func TestCapabilities_SupportedCapabilities(t *testing.T) {
 }
 
 func TestLoad(t *testing.T) {
-	tmpDir, err := os.MkdirTemp(os.TempDir(), "*")
-	require.NoError(t, err)
+	tmpDir := t.TempDir()
 
 	t.Cleanup(func() {
 		require.NoError(t, os.Chmod(tmpDir, 0o700))
 		require.NoError(t, os.RemoveAll(tmpDir))
 	})
 
 	executablePath := filepath.Join(tmpDir, "binary")
-	err = os.WriteFile(executablePath, []byte{}, 0o600)
+	err := os.WriteFile(executablePath, []byte{}, 0o600)
 	require.NoError(t, err)
 
 	testCases := []struct {
@@ -704,10 +703,8 @@ agent:
 func setupSupervisorConfigFile(t *testing.T, tmpDir, configString string) string {
 	t.Helper()
 
-	testDir, err := os.MkdirTemp(tmpDir, "*")
-	require.NoError(t, err)
-	cfgPath := filepath.Join(testDir, "config.yaml")
-	err = os.WriteFile(cfgPath, []byte(configString), 0o600)
+	cfgPath := filepath.Join(tmpDir, "config.yaml")
+	err := os.WriteFile(cfgPath, []byte(configString), 0o600)
 	require.NoError(t, err)
 	return cfgPath
 }

cmd/opampsupervisor/supervisor/supervisor_test.go

@@ -104,11 +104,10 @@ telemetry:
 func setupSupervisorConfig(t *testing.T, configuration string) config.Supervisor {
 	t.Helper()
 
-	tmpDir, err := os.MkdirTemp(os.TempDir(), "*")
-	require.NoError(t, err)
+	tmpDir := t.TempDir()
 
 	executablePath := filepath.Join(tmpDir, "binary")
-	err = os.WriteFile(executablePath, []byte{}, 0o600)
+	err := os.WriteFile(executablePath, []byte{}, 0o600)
 	require.NoError(t, err)
 	configuration = fmt.Sprintf(configuration, filepath.Join(tmpDir, "storage"), executablePath)
 
@@ -1513,8 +1512,7 @@ service:
 }
 
 func TestSupervisor_configStrictUnmarshal(t *testing.T) {
-	tmpDir, err := os.MkdirTemp(os.TempDir(), "*")
-	require.NoError(t, err)
+	tmpDir := t.TempDir()
 
 	configuration := `
 server:
@@ -1528,7 +1526,7 @@ capabilities:
 `
 
 	cfgPath := filepath.Join(tmpDir, "config.yaml")
-	err = os.WriteFile(cfgPath, []byte(configuration), 0o600)
+	err := os.WriteFile(cfgPath, []byte(configuration), 0o600)
 	require.NoError(t, err)
 
 	_, err = config.Load(cfgPath)

confmap/provider/aesprovider/provider_test.go

@@ -5,7 +5,6 @@ package aesprovider
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -95,11 +94,8 @@ func TestAESCredentialProvider(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			os.Clearenv()
 			for k, v := range tt.envVars {
-				if err := os.Setenv(k, v); err != nil {
-					t.Fatalf("Failed to set env var %s: %v", k, err)
-				}
+				t.Setenv(k, v)
 			}
 
 			p := NewFactory().Create(confmap.ProviderSettings{})

exporter/azuremonitorexporter/connection_string_parser_test.go

@@ -4,7 +4,6 @@
 package azuremonitorexporter
 
 import (
-	"os"
 	"strings"
 	"testing"
 
@@ -146,8 +145,7 @@ func TestParseConnectionString(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if tt.envValue != "" {
-				os.Setenv(ApplicationInsightsConnectionString, tt.envValue)
-				defer os.Unsetenv(ApplicationInsightsConnectionString)
+				t.Setenv(ApplicationInsightsConnectionString, tt.envValue)
 			}
 
 			got, err := parseConnectionString(tt.config)

exporter/datadogexporter/examples_test.go

@@ -76,7 +76,7 @@ func TestExamples(t *testing.T) {
 		require.NotEmpty(t, out.Data.YAML)
 
 		data := []byte(out.Data.YAML)
-		f, err := os.CreateTemp("", "ddexporter-yaml-test-")
+		f, err := os.CreateTemp(t.TempDir(), "ddexporter-yaml-test-")
 		require.NoError(t, err)
 		n, err := f.Write(data)
 		require.NoError(t, err)

exporter/elasticsearchexporter/integrationtest/collector.go

@@ -155,7 +155,7 @@ func newRecreatableOtelCol(tb testing.TB) *recreatableOtelCol {
 	}
 }
 
-func (c *recreatableOtelCol) PrepareConfig(configStr string) (func(), error) {
+func (c *recreatableOtelCol) PrepareConfig(_ *testing.T, configStr string) (func(), error) {
 	configCleanup := func() {
 		// NoOp
 	}

exporter/elasticsearchexporter/integrationtest/exporter_test.go

@@ -86,7 +86,7 @@ func runner(t *testing.T, eventType string, restartCollector, mockESFailure bool
 	cfg := createConfigYaml(t, sender, receiver, nil, nil, eventType, getDebugFlag(t))
 	t.Log("test otel collector configuration:", cfg)
 	collector := newRecreatableOtelCol(t)
-	cleanup, err := collector.PrepareConfig(cfg)
+	cleanup, err := collector.PrepareConfig(t, cfg)
 	require.NoError(t, err)
 	defer cleanup()
 

extension/basicauthextension/extension_test.go

@@ -45,7 +45,7 @@ var credentials = [][]string{
 
 func TestBasicAuth_Valid(t *testing.T) {
 	t.Parallel()
-	f, err := os.CreateTemp("", ".htpasswd")
+	f, err := os.CreateTemp(t.TempDir(), ".htpasswd")
 	require.NoError(t, err)
 	defer os.Remove(f.Name())
 
@@ -146,7 +146,7 @@ func TestBasicAuth_InvalidFormat(t *testing.T) {
 
 func TestBasicAuth_HtpasswdInlinePrecedence(t *testing.T) {
 	t.Parallel()
-	f, err := os.CreateTemp("", ".htpasswd")
+	f, err := os.CreateTemp(t.TempDir(), ".htpasswd")
 	require.NoError(t, err)
 	defer os.Remove(f.Name())
 

extension/jaegerremotesampling/internal/source/filesource/filesource_test.go

@@ -376,7 +376,7 @@ func TestDeepCopy(t *testing.T) {
 }
 
 func TestAutoUpdateStrategyWithFile(t *testing.T) {
-	tempFile, _ := os.CreateTemp("", "for_go_test_*.json")
+	tempFile, _ := os.CreateTemp(t.TempDir(), "for_go_test_*.json")
 	require.NoError(t, tempFile.Close())
 	defer func() {
 		require.NoError(t, os.Remove(tempFile.Name()))
@@ -462,7 +462,7 @@ func TestAutoUpdateStrategyWithURL(t *testing.T) {
 }
 
 func TestAutoUpdateStrategyErrors(t *testing.T) {
-	tempFile, _ := os.CreateTemp("", "for_go_test_*.json")
+	tempFile, _ := os.CreateTemp(t.TempDir(), "for_go_test_*.json")
 	require.NoError(t, tempFile.Close())
 	defer func() {
 		_ = os.Remove(tempFile.Name())

extension/pprofextension/pprofextension_test.go

@@ -114,7 +114,7 @@ func TestPerformanceProfilerShutdownWithoutStart(t *testing.T) {
 }
 
 func TestPerformanceProfilerLifecycleWithFile(t *testing.T) {
-	tmpFile, err := os.CreateTemp("", "pprof*.yaml")
+	tmpFile, err := os.CreateTemp(t.TempDir(), "pprof*.yaml")
 	require.NoError(t, err)
 	defer func() {
 		os.Remove(tmpFile.Name())

extension/storage/filestorage/config_test.go

@@ -87,7 +87,7 @@ func TestHandleProvidingFilePathAsDirWithAnError(t *testing.T) {
 	f := NewFactory()
 	cfg := f.CreateDefaultConfig().(*Config)
 
-	file, err := os.CreateTemp("", "")
+	file, err := os.CreateTemp(t.TempDir(), "")
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		require.NoError(t, file.Close())

extension/sumologicextension/credentials/credentialsstore_localfs_test.go

@@ -18,11 +18,7 @@ import (
 )
 
 func TestCredentialsStoreLocalFs(t *testing.T) {
-	dir, err := os.MkdirTemp("", "otelcol-sumo-credentials-store-local-fs-test-*")
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		os.RemoveAll(dir)
-	})
+	dir := t.TempDir()
 
 	const key = "my_storage_key"