Skip to content

Commit 3ee48c4

Browse files
authored
[chore] Add // nolint:staticcheck to unblock release (#33599)
Unblocks #33593 Related to #33594
1 parent 2f079f9 commit 3ee48c4

File tree

17 files changed

+56
-5
lines changed

17 files changed

+56
-5
lines changed

connector/datadogconnector/example_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ func TestExamples(t *testing.T) {
2525
t.Setenv("DD_API_KEY", "testvalue")
2626
factories := newTestComponents(t)
2727
const configFile = "./examples/config.yaml"
28+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
29+
// nolint:staticcheck
2830
_, err := otelcoltest.LoadConfigAndValidate(configFile, factories)
2931
require.NoError(t, err, "All yaml config must validate. Please ensure that all necessary component factories are added in newTestComponents()")
3032
}

connector/servicegraphconnector/config_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ func TestLoadConfig(t *testing.T) {
2222
require.NoError(t, err)
2323

2424
factories.Connectors[metadata.Type] = NewFactory()
25-
25+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
26+
// nolint:staticcheck
2627
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "service-graph-connector-config.yaml"), factories)
2728

2829
// Verify

exporter/awss3exporter/config_test.go

+10
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ func TestLoadConfig(t *testing.T) {
2323

2424
factory := NewFactory()
2525
factories.Exporters[metadata.Type] = factory
26+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
27+
// nolint:staticcheck
2628
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "default.yaml"), factories)
2729

2830
require.NoError(t, err)
@@ -50,6 +52,8 @@ func TestConfig(t *testing.T) {
5052

5153
factory := NewFactory()
5254
factories.Exporters[factory.Type()] = factory
55+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
56+
// nolint:staticcheck
5357
cfg, err := otelcoltest.LoadConfigAndValidate(
5458
filepath.Join("testdata", "config.yaml"), factories)
5559

@@ -78,6 +82,8 @@ func TestConfigForS3CompatibleSystems(t *testing.T) {
7882

7983
factory := NewFactory()
8084
factories.Exporters[factory.Type()] = factory
85+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
86+
// nolint:staticcheck
8187
cfg, err := otelcoltest.LoadConfigAndValidate(
8288
filepath.Join("testdata", "config-s3-compatible-systems.yaml"), factories)
8389

@@ -189,6 +195,8 @@ func TestMarshallerName(t *testing.T) {
189195

190196
factory := NewFactory()
191197
factories.Exporters[factory.Type()] = factory
198+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
199+
// nolint:staticcheck
192200
cfg, err := otelcoltest.LoadConfigAndValidate(
193201
filepath.Join("testdata", "marshaler.yaml"), factories)
194202

@@ -229,6 +237,8 @@ func TestCompressionName(t *testing.T) {
229237

230238
factory := NewFactory()
231239
factories.Exporters[factory.Type()] = factory
240+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
241+
// nolint:staticcheck
232242
cfg, err := otelcoltest.LoadConfigAndValidate(
233243
filepath.Join("testdata", "compression.yaml"), factories)
234244

exporter/datadogexporter/examples_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ func TestExamples(t *testing.T) {
5555
t.Run(filepath.Base(f.Name()), func(t *testing.T) {
5656
t.Setenv("DD_API_KEY", "testvalue")
5757
name := filepath.Join(folder, f.Name())
58+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
59+
// nolint:staticcheck
5860
_, err := otelcoltest.LoadConfigAndValidate(name, factories)
5961
require.NoError(t, err, "All yaml config must validate. Please ensure that all necessary component factories are added in newTestComponents()")
6062
})
@@ -83,7 +85,8 @@ func TestExamples(t *testing.T) {
8385
require.Equal(t, n, len(data))
8486
require.NoError(t, f.Close())
8587
defer os.RemoveAll(f.Name())
86-
88+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
89+
// nolint:staticcheck
8790
_, err = otelcoltest.LoadConfigAndValidate(f.Name(), factories)
8891
require.NoError(t, err, "All yaml config must validate. Please ensure that all necessary component factories are added in newTestComponents()")
8992
})

exporter/datadogexporter/integrationtest/integration_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,8 @@ func getIntegrationTestCollector(t *testing.T, cfgStr string, url string, factor
268268
require.NoError(t, err)
269269
_, err = confFile.Write([]byte(cfg))
270270
require.NoError(t, err)
271+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
272+
// nolint:staticcheck
271273
_, err = otelcoltest.LoadConfigAndValidate(confFile.Name(), factories)
272274
require.NoError(t, err, "All yaml config must be valid.")
273275

exporter/googlemanagedprometheusexporter/config_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ func TestLoadConfig(t *testing.T) {
2424

2525
factory := NewFactory()
2626
factories.Exporters[metadata.Type] = factory
27+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
28+
// nolint:staticcheck
2729
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories)
2830

2931
require.NoError(t, err)

exporter/loadbalancingexporter/metrics_exporter_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,8 @@ func TestBuildExporterConfigUnknown(t *testing.T) {
459459
require.NoError(t, err)
460460

461461
factories.Exporters[metadata.Type] = NewFactory()
462-
462+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
463+
// nolint:staticcheck
463464
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "test-build-exporter-config.yaml"), factories)
464465
require.NoError(t, err)
465466
require.NotNil(t, cfg)

exporter/loadbalancingexporter/trace_exporter_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,8 @@ func TestBuildExporterConfig(t *testing.T) {
350350
require.NoError(t, err)
351351

352352
factories.Exporters[metadata.Type] = NewFactory()
353-
353+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
354+
// nolint:staticcheck
354355
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "test-build-exporter-config.yaml"), factories)
355356
require.NoError(t, err)
356357
require.NotNil(t, cfg)

processor/probabilisticsamplerprocessor/config_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ func TestLoadInvalidConfig(t *testing.T) {
8484

8585
factory := NewFactory()
8686
factories.Processors[metadata.Type] = factory
87-
87+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
88+
// nolint:staticcheck
8889
_, err = otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", test.file), factories)
8990
require.ErrorContains(t, err, test.contains)
9091
})

processor/sumologicprocessor/config_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ func TestLoadConfig(t *testing.T) {
2121

2222
factory := NewFactory()
2323
factories.Processors[metadata.Type] = factory
24+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
25+
// nolint:staticcheck
2426
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories)
2527

2628
require.NoError(t, err)

receiver/azureblobreceiver/config_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ func TestLoadConfig(t *testing.T) {
2222

2323
factory := NewFactory()
2424
factories.Receivers[metadata.Type] = factory
25+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
26+
// nolint:staticcheck
2527
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories)
2628

2729
require.NoError(t, err)

receiver/azureeventhubreceiver/config_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ func TestLoadConfig(t *testing.T) {
2121

2222
factory := NewFactory()
2323
factories.Receivers[metadata.Type] = factory
24+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
25+
// nolint:staticcheck
2426
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories)
2527

2628
require.NoError(t, err)

receiver/gitproviderreceiver/config_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ func TestLoadConfig(t *testing.T) {
2626

2727
factory := NewFactory()
2828
factories.Receivers[metadata.Type] = factory
29+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
30+
// nolint:staticcheck
2931
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories)
3032

3133
require.NoError(t, err)
@@ -61,6 +63,8 @@ func TestLoadInvalidConfig_NoScrapers(t *testing.T) {
6163

6264
factory := NewFactory()
6365
factories.Receivers[metadata.Type] = factory
66+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
67+
// nolint:staticcheck
6468
_, err = otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config-noscrapers.yaml"), factories)
6569

6670
require.Contains(t, err.Error(), "must specify at least one scraper")
@@ -72,6 +76,8 @@ func TestLoadInvalidConfig_InvalidScraperKey(t *testing.T) {
7276

7377
factory := NewFactory()
7478
factories.Receivers[metadata.Type] = factory
79+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
80+
// nolint:staticcheck
7581
_, err = otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config-invalidscraperkey.yaml"), factories)
7682

7783
require.Contains(t, err.Error(), "error reading configuration for \"gitprovider\": invalid scraper key: \"invalidscraperkey\"")

receiver/hostmetricsreceiver/config_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ func TestLoadConfig(t *testing.T) {
3535

3636
factory := NewFactory()
3737
factories.Receivers[metadata.Type] = factory
38+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
39+
// nolint:staticcheck
3840
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories)
3941

4042
require.NoError(t, err)
@@ -127,6 +129,8 @@ func TestLoadInvalidConfig_NoScrapers(t *testing.T) {
127129

128130
factory := NewFactory()
129131
factories.Receivers[metadata.Type] = factory
132+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
133+
// nolint:staticcheck
130134
_, err = otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config-noscrapers.yaml"), factories)
131135

132136
require.Contains(t, err.Error(), "must specify at least one scraper when using hostmetrics receiver")
@@ -138,6 +142,8 @@ func TestLoadInvalidConfig_InvalidScraperKey(t *testing.T) {
138142

139143
factory := NewFactory()
140144
factories.Receivers[metadata.Type] = factory
145+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
146+
// nolint:staticcheck
141147
_, err = otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config-invalidscraperkey.yaml"), factories)
142148

143149
require.Contains(t, err.Error(), "error reading configuration for \"hostmetrics\": invalid scraper key: invalidscraperkey")

receiver/hostmetricsreceiver/hostmetrics_linux_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ func TestLoadConfigRootPath(t *testing.T) {
3838
factories, _ := otelcoltest.NopFactories()
3939
factory := NewFactory()
4040
factories.Receivers[metadata.Type] = factory
41+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
42+
// nolint:staticcheck
4143
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config-root-path.yaml"), factories)
4244
require.NoError(t, err)
4345
globalRootPath = ""
@@ -63,6 +65,8 @@ func TestLoadInvalidConfig_RootPathNotExist(t *testing.T) {
6365
factories, _ := otelcoltest.NopFactories()
6466
factory := NewFactory()
6567
factories.Receivers[metadata.Type] = factory
68+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
69+
// nolint:staticcheck
6670
_, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config-bad-root-path.yaml"), factories)
6771
assert.ErrorContains(t, err, "invalid root_path:")
6872
globalRootPath = ""

receiver/receivercreator/config_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ func TestInvalidResourceAttributeEndpointType(t *testing.T) {
143143

144144
factory := NewFactory()
145145
factories.Receivers[metadata.Type] = factory
146+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
147+
// nolint:staticcheck
146148
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "invalid-resource-attributes.yaml"), factories)
147149
require.Contains(t, err.Error(), "error reading configuration for \"receiver_creator\": resource attributes for unsupported endpoint type \"not.a.real.type\"")
148150
require.Nil(t, cfg)
@@ -156,6 +158,8 @@ func TestInvalidReceiverResourceAttributeValueType(t *testing.T) {
156158

157159
factory := NewFactory()
158160
factories.Receivers[metadata.Type] = factory
161+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
162+
// nolint:staticcheck
159163
cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "invalid-receiver-resource-attributes.yaml"), factories)
160164
require.Contains(t, err.Error(), "error reading configuration for \"receiver_creator\": unsupported `resource_attributes` \"one\" value <nil> in examplereceiver/1")
161165
require.Nil(t, cfg)

receiver/snmpreceiver/integration_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ func TestIntegration(t *testing.T) {
5959
factory := NewFactory()
6060
factories.Receivers[metadata.Type] = factory
6161
configFile := filepath.Join("testdata", "integration", testCase.configFilename)
62+
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33594
63+
// nolint:staticcheck
6264
cfg, err := otelcoltest.LoadConfigAndValidate(configFile, factories)
6365
require.NoError(t, err)
6466
snmpConfig := cfg.Receivers[component.NewID(metadata.Type)].(*Config)

0 commit comments

Comments
 (0)