Skip to content

Commit 78528a2

Browse files
atoulmeFiery-Fenix
authored andcommitted
[chore] use new linter usetesting (open-telemetry#38834)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Swap linter tenv to usetesting <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes open-telemetry#38833 <!--Please delete paragraphs that you did not use before submitting.-->
1 parent 1e7ebcd commit 78528a2

File tree

36 files changed

+91
-142
lines changed

36 files changed

+91
-142
lines changed

.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,13 @@ linters:
216216
- reassign
217217
- revive
218218
- staticcheck
219-
- tenv
220219
- testifylint
221220
- thelper
222221
- unconvert
223222
- unparam
224223
- unused
225224
- usestdlibvars
225+
- usetesting
226226
- wastedassign
227227
- whitespace
228228

cmd/opampsupervisor/supervisor/config/config_test.go

+4-7
Original file line numberDiff line numberDiff line change
@@ -486,16 +486,15 @@ func TestCapabilities_SupportedCapabilities(t *testing.T) {
486486
}
487487

488488
func TestLoad(t *testing.T) {
489-
tmpDir, err := os.MkdirTemp(os.TempDir(), "*")
490-
require.NoError(t, err)
489+
tmpDir := t.TempDir()
491490

492491
t.Cleanup(func() {
493492
require.NoError(t, os.Chmod(tmpDir, 0o700))
494493
require.NoError(t, os.RemoveAll(tmpDir))
495494
})
496495

497496
executablePath := filepath.Join(tmpDir, "binary")
498-
err = os.WriteFile(executablePath, []byte{}, 0o600)
497+
err := os.WriteFile(executablePath, []byte{}, 0o600)
499498
require.NoError(t, err)
500499

501500
testCases := []struct {
@@ -704,10 +703,8 @@ agent:
704703
func setupSupervisorConfigFile(t *testing.T, tmpDir, configString string) string {
705704
t.Helper()
706705

707-
testDir, err := os.MkdirTemp(tmpDir, "*")
708-
require.NoError(t, err)
709-
cfgPath := filepath.Join(testDir, "config.yaml")
710-
err = os.WriteFile(cfgPath, []byte(configString), 0o600)
706+
cfgPath := filepath.Join(tmpDir, "config.yaml")
707+
err := os.WriteFile(cfgPath, []byte(configString), 0o600)
711708
require.NoError(t, err)
712709
return cfgPath
713710
}

cmd/opampsupervisor/supervisor/supervisor_test.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,10 @@ telemetry:
104104
func setupSupervisorConfig(t *testing.T, configuration string) config.Supervisor {
105105
t.Helper()
106106

107-
tmpDir, err := os.MkdirTemp(os.TempDir(), "*")
108-
require.NoError(t, err)
107+
tmpDir := t.TempDir()
109108

110109
executablePath := filepath.Join(tmpDir, "binary")
111-
err = os.WriteFile(executablePath, []byte{}, 0o600)
110+
err := os.WriteFile(executablePath, []byte{}, 0o600)
112111
require.NoError(t, err)
113112
configuration = fmt.Sprintf(configuration, filepath.Join(tmpDir, "storage"), executablePath)
114113

@@ -1513,8 +1512,7 @@ service:
15131512
}
15141513

15151514
func TestSupervisor_configStrictUnmarshal(t *testing.T) {
1516-
tmpDir, err := os.MkdirTemp(os.TempDir(), "*")
1517-
require.NoError(t, err)
1515+
tmpDir := t.TempDir()
15181516

15191517
configuration := `
15201518
server:
@@ -1528,7 +1526,7 @@ capabilities:
15281526
`
15291527

15301528
cfgPath := filepath.Join(tmpDir, "config.yaml")
1531-
err = os.WriteFile(cfgPath, []byte(configuration), 0o600)
1529+
err := os.WriteFile(cfgPath, []byte(configuration), 0o600)
15321530
require.NoError(t, err)
15331531

15341532
_, err = config.Load(cfgPath)

confmap/provider/aesprovider/provider_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package aesprovider
55

66
import (
77
"context"
8-
"os"
98
"testing"
109

1110
"github.com/stretchr/testify/require"
@@ -95,11 +94,8 @@ func TestAESCredentialProvider(t *testing.T) {
9594

9695
for _, tt := range tests {
9796
t.Run(tt.name, func(t *testing.T) {
98-
os.Clearenv()
9997
for k, v := range tt.envVars {
100-
if err := os.Setenv(k, v); err != nil {
101-
t.Fatalf("Failed to set env var %s: %v", k, err)
102-
}
98+
t.Setenv(k, v)
10399
}
104100

105101
p := NewFactory().Create(confmap.ProviderSettings{})

exporter/azuremonitorexporter/connection_string_parser_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package azuremonitorexporter
55

66
import (
7-
"os"
87
"strings"
98
"testing"
109

@@ -146,8 +145,7 @@ func TestParseConnectionString(t *testing.T) {
146145
for _, tt := range tests {
147146
t.Run(tt.name, func(t *testing.T) {
148147
if tt.envValue != "" {
149-
os.Setenv(ApplicationInsightsConnectionString, tt.envValue)
150-
defer os.Unsetenv(ApplicationInsightsConnectionString)
148+
t.Setenv(ApplicationInsightsConnectionString, tt.envValue)
151149
}
152150

153151
got, err := parseConnectionString(tt.config)

exporter/datadogexporter/examples_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func TestExamples(t *testing.T) {
7676
require.NotEmpty(t, out.Data.YAML)
7777

7878
data := []byte(out.Data.YAML)
79-
f, err := os.CreateTemp("", "ddexporter-yaml-test-")
79+
f, err := os.CreateTemp(t.TempDir(), "ddexporter-yaml-test-")
8080
require.NoError(t, err)
8181
n, err := f.Write(data)
8282
require.NoError(t, err)

exporter/elasticsearchexporter/integrationtest/collector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func newRecreatableOtelCol(tb testing.TB) *recreatableOtelCol {
155155
}
156156
}
157157

158-
func (c *recreatableOtelCol) PrepareConfig(configStr string) (func(), error) {
158+
func (c *recreatableOtelCol) PrepareConfig(_ *testing.T, configStr string) (func(), error) {
159159
configCleanup := func() {
160160
// NoOp
161161
}

exporter/elasticsearchexporter/integrationtest/exporter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func runner(t *testing.T, eventType string, restartCollector, mockESFailure bool
8686
cfg := createConfigYaml(t, sender, receiver, nil, nil, eventType, getDebugFlag(t))
8787
t.Log("test otel collector configuration:", cfg)
8888
collector := newRecreatableOtelCol(t)
89-
cleanup, err := collector.PrepareConfig(cfg)
89+
cleanup, err := collector.PrepareConfig(t, cfg)
9090
require.NoError(t, err)
9191
defer cleanup()
9292

extension/basicauthextension/extension_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var credentials = [][]string{
4545

4646
func TestBasicAuth_Valid(t *testing.T) {
4747
t.Parallel()
48-
f, err := os.CreateTemp("", ".htpasswd")
48+
f, err := os.CreateTemp(t.TempDir(), ".htpasswd")
4949
require.NoError(t, err)
5050
defer os.Remove(f.Name())
5151

@@ -146,7 +146,7 @@ func TestBasicAuth_InvalidFormat(t *testing.T) {
146146

147147
func TestBasicAuth_HtpasswdInlinePrecedence(t *testing.T) {
148148
t.Parallel()
149-
f, err := os.CreateTemp("", ".htpasswd")
149+
f, err := os.CreateTemp(t.TempDir(), ".htpasswd")
150150
require.NoError(t, err)
151151
defer os.Remove(f.Name())
152152

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ func TestDeepCopy(t *testing.T) {
376376
}
377377

378378
func TestAutoUpdateStrategyWithFile(t *testing.T) {
379-
tempFile, _ := os.CreateTemp("", "for_go_test_*.json")
379+
tempFile, _ := os.CreateTemp(t.TempDir(), "for_go_test_*.json")
380380
require.NoError(t, tempFile.Close())
381381
defer func() {
382382
require.NoError(t, os.Remove(tempFile.Name()))
@@ -462,7 +462,7 @@ func TestAutoUpdateStrategyWithURL(t *testing.T) {
462462
}
463463

464464
func TestAutoUpdateStrategyErrors(t *testing.T) {
465-
tempFile, _ := os.CreateTemp("", "for_go_test_*.json")
465+
tempFile, _ := os.CreateTemp(t.TempDir(), "for_go_test_*.json")
466466
require.NoError(t, tempFile.Close())
467467
defer func() {
468468
_ = os.Remove(tempFile.Name())

extension/pprofextension/pprofextension_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func TestPerformanceProfilerShutdownWithoutStart(t *testing.T) {
114114
}
115115

116116
func TestPerformanceProfilerLifecycleWithFile(t *testing.T) {
117-
tmpFile, err := os.CreateTemp("", "pprof*.yaml")
117+
tmpFile, err := os.CreateTemp(t.TempDir(), "pprof*.yaml")
118118
require.NoError(t, err)
119119
defer func() {
120120
os.Remove(tmpFile.Name())

extension/storage/filestorage/config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func TestHandleProvidingFilePathAsDirWithAnError(t *testing.T) {
8787
f := NewFactory()
8888
cfg := f.CreateDefaultConfig().(*Config)
8989

90-
file, err := os.CreateTemp("", "")
90+
file, err := os.CreateTemp(t.TempDir(), "")
9191
require.NoError(t, err)
9292
t.Cleanup(func() {
9393
require.NoError(t, file.Close())

extension/sumologicextension/credentials/credentialsstore_localfs_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ import (
1818
)
1919

2020
func TestCredentialsStoreLocalFs(t *testing.T) {
21-
dir, err := os.MkdirTemp("", "otelcol-sumo-credentials-store-local-fs-test-*")
22-
require.NoError(t, err)
23-
t.Cleanup(func() {
24-
os.RemoveAll(dir)
25-
})
21+
dir := t.TempDir()
2622

2723
const key = "my_storage_key"
2824

0 commit comments

Comments
 (0)