Skip to content

Commit 158ee0e

Browse files
MovieStoreGuyMovieStoreGuy
authored
[chore] Update tests to include scraper settings (#24653)
**Description:** With the most recent changes in open-telemetry/opentelemetry-collector#7951 caused a bunch of tests to fail on upgrade. This just adds in the scraper settings where needed.
1 parent b44a1ba commit 158ee0e

File tree

17 files changed

+194
-78
lines changed

17 files changed

+194
-78
lines changed

‎receiver/aerospikereceiver/config_test.go

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"go.opentelemetry.io/collector/component"
1313
"go.opentelemetry.io/collector/config/configtls"
1414
"go.opentelemetry.io/collector/confmap/confmaptest"
15+
"go.opentelemetry.io/collector/receiver/scraperhelper"
1516

1617
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/internal/metadata"
1718
)
@@ -25,67 +26,76 @@ func TestValidate(t *testing.T) {
2526
{
2627
name: "blank endpoint",
2728
config: &Config{
28-
Endpoint: "",
29+
Endpoint: "",
30+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
2931
},
3032
expected: errEmptyEndpoint,
3133
},
3234
{
3335
name: "missing port",
3436
config: &Config{
35-
Endpoint: "localhost",
37+
Endpoint: "localhost",
38+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
3639
},
3740
expected: errBadEndpoint,
3841
},
3942
{
4043
name: "bad endpoint",
4144
config: &Config{
42-
Endpoint: "x;;ef;s;d:::ss:23423423423423423",
45+
Endpoint: "x;;ef;s;d:::ss:23423423423423423",
46+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
4347
},
4448
expected: errBadEndpoint,
4549
},
4650
{
4751
name: "missing host",
4852
config: &Config{
49-
Endpoint: ":3001",
53+
Endpoint: ":3001",
54+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
5055
},
5156
expected: errBadEndpoint,
5257
},
5358
{
5459
name: "negative port",
5560
config: &Config{
56-
Endpoint: "localhost:-2",
61+
Endpoint: "localhost:-2",
62+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
5763
},
5864
expected: errBadPort,
5965
},
6066
{
6167
name: "bad port",
6268
config: &Config{
63-
Endpoint: "localhost:9999999999999999999",
69+
Endpoint: "localhost:9999999999999999999",
70+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
6471
},
6572
expected: errBadPort,
6673
},
6774
{
6875
name: "negative timeout",
6976
config: &Config{
70-
Endpoint: "localhost:3000",
71-
Timeout: -1 * time.Second,
77+
Endpoint: "localhost:3000",
78+
Timeout: -1 * time.Second,
79+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
7280
},
7381
expected: errNegativeTimeout,
7482
},
7583
{
7684
name: "password but no username",
7785
config: &Config{
78-
Endpoint: "localhost:3000",
79-
Username: "",
80-
Password: "secret",
86+
Endpoint: "localhost:3000",
87+
Username: "",
88+
Password: "secret",
89+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
8190
},
8291
expected: errEmptyUsername,
8392
},
8493
{
8594
name: "username but no password",
8695
config: &Config{
87-
Endpoint: "localhost:3000",
88-
Username: "ro_user",
96+
Endpoint: "localhost:3000",
97+
Username: "ro_user",
98+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
8999
},
90100
expected: errEmptyPassword,
91101
},
@@ -100,6 +110,7 @@ func TestValidate(t *testing.T) {
100110
CAFile: "BADCAFILE",
101111
},
102112
},
113+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
103114
},
104115
expected: errFailedTLSLoad,
105116
},
@@ -112,6 +123,7 @@ func TestValidate(t *testing.T) {
112123
Insecure: false,
113124
TLSSetting: configtls.TLSSetting{},
114125
},
126+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
115127
},
116128
expected: errEmptyEndpointTLSName,
117129
},

‎receiver/apachesparkreceiver/config_test.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import (
88

99
"github.com/stretchr/testify/require"
1010
"go.opentelemetry.io/collector/config/confighttp"
11+
"go.opentelemetry.io/collector/receiver/scraperhelper"
12+
13+
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachesparkreceiver/internal/metadata"
1114
)
1215

1316
func TestValidate(t *testing.T) {
@@ -17,8 +20,10 @@ func TestValidate(t *testing.T) {
1720
expectedErr error
1821
}{
1922
{
20-
desc: "default config",
21-
cfg: &Config{},
23+
desc: "default config",
24+
cfg: &Config{
25+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
26+
},
2227
expectedErr: nil,
2328
},
2429
{
@@ -27,6 +32,7 @@ func TestValidate(t *testing.T) {
2732
HTTPClientSettings: confighttp.HTTPClientSettings{
2833
Endpoint: "invalid://endpoint 12efg",
2934
},
35+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
3036
},
3137
expectedErr: errInvalidEndpoint,
3238
},

‎receiver/bigipreceiver/config_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"go.opentelemetry.io/collector/component"
1313
"go.opentelemetry.io/collector/config/confighttp"
1414
"go.opentelemetry.io/collector/confmap/confmaptest"
15+
"go.opentelemetry.io/collector/receiver/scraperhelper"
1516
"go.uber.org/multierr"
1617

1718
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver/internal/metadata"
@@ -33,6 +34,7 @@ func TestValidate(t *testing.T) {
3334
HTTPClientSettings: confighttp.HTTPClientSettings{
3435
Endpoint: "invalid://endpoint: 12efg",
3536
},
37+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
3638
},
3739
expectedErr: multierr.Combine(
3840
errMissingUsername,
@@ -46,7 +48,7 @@ func TestValidate(t *testing.T) {
4648
Username: "otelu",
4749
HTTPClientSettings: confighttp.HTTPClientSettings{
4850
Endpoint: "invalid://endpoint: 12efg",
49-
},
51+
}, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
5052
},
5153
expectedErr: multierr.Combine(
5254
errMissingPassword,
@@ -60,6 +62,7 @@ func TestValidate(t *testing.T) {
6062
HTTPClientSettings: confighttp.HTTPClientSettings{
6163
Endpoint: "invalid://endpoint: 12efg",
6264
},
65+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
6366
},
6467
expectedErr: multierr.Combine(
6568
errMissingUsername,
@@ -74,6 +77,7 @@ func TestValidate(t *testing.T) {
7477
HTTPClientSettings: confighttp.HTTPClientSettings{
7578
Endpoint: "invalid://endpoint: 12efg",
7679
},
80+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
7781
},
7882
expectedErr: multierr.Combine(
7983
fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`),
@@ -87,6 +91,7 @@ func TestValidate(t *testing.T) {
8791
HTTPClientSettings: confighttp.HTTPClientSettings{
8892
Endpoint: defaultEndpoint,
8993
},
94+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
9095
},
9196
expectedErr: nil,
9297
},

‎receiver/couchdbreceiver/config_test.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"go.opentelemetry.io/collector/component"
1414
"go.opentelemetry.io/collector/config/confighttp"
1515
"go.opentelemetry.io/collector/confmap/confmaptest"
16+
"go.opentelemetry.io/collector/receiver/scraperhelper"
1617
"go.uber.org/multierr"
1718

1819
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver/internal/metadata"
@@ -30,6 +31,7 @@ func TestValidate(t *testing.T) {
3031
HTTPClientSettings: confighttp.HTTPClientSettings{
3132
Endpoint: "http://localhost :5984",
3233
},
34+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
3335
},
3436
expectedErr: multierr.Combine(
3537
errMissingUsername,
@@ -43,7 +45,8 @@ func TestValidate(t *testing.T) {
4345
HTTPClientSettings: confighttp.HTTPClientSettings{
4446
Endpoint: "http://localhost :5984",
4547
},
46-
Username: "otelu",
48+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
49+
Username: "otelu",
4750
},
4851
expectedErr: multierr.Combine(
4952
errMissingPassword,
@@ -56,7 +59,8 @@ func TestValidate(t *testing.T) {
5659
HTTPClientSettings: confighttp.HTTPClientSettings{
5760
Endpoint: "http://localhost :5984",
5861
},
59-
Password: "otelp",
62+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
63+
Password: "otelp",
6064
},
6165
expectedErr: multierr.Combine(
6266
errMissingUsername,
@@ -71,6 +75,7 @@ func TestValidate(t *testing.T) {
7175
HTTPClientSettings: confighttp.HTTPClientSettings{
7276
Endpoint: "http://localhost :5984",
7377
},
78+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
7479
},
7580
expectedErr: fmt.Errorf(errInvalidEndpoint.Error(), "parse \"http://localhost :5984\": invalid character \" \" in host name"),
7681
},
@@ -82,6 +87,7 @@ func TestValidate(t *testing.T) {
8287
HTTPClientSettings: confighttp.HTTPClientSettings{
8388
Endpoint: "http://localhost:5984",
8489
},
90+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
8591
},
8692
expectedErr: nil,
8793
},

‎receiver/dockerstatsreceiver/config_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,9 @@ func TestLoadConfig(t *testing.T) {
9191
}
9292

9393
func TestValidateErrors(t *testing.T) {
94-
cfg := &Config{}
94+
cfg := &Config{ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type)}
9595
assert.Equal(t, "endpoint must be specified", component.ValidateConfig(cfg).Error())
9696

97-
cfg = &Config{Endpoint: "someEndpoint"}
98-
assert.Equal(t, "collection_interval must be a positive duration", component.ValidateConfig(cfg).Error())
99-
10097
cfg = &Config{ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: 1 * time.Second}, Endpoint: "someEndpoint", DockerAPIVersion: 1.21}
10198
assert.Equal(t, "api_version must be at least 1.22", component.ValidateConfig(cfg).Error())
10299
}

‎receiver/filestatsreceiver/config_test.go

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import (
88
"testing"
99

1010
"github.com/stretchr/testify/assert"
11+
"go.opentelemetry.io/collector/receiver/scraperhelper"
12+
13+
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver/internal/metadata"
1114
)
1215

1316
func Test_Config_Validate(t *testing.T) {
@@ -17,13 +20,19 @@ func Test_Config_Validate(t *testing.T) {
1720
wantErr error
1821
}{
1922
{
20-
name: "valid",
21-
cfg: &Config{Include: "/var/log/*.log"},
23+
name: "valid",
24+
cfg: &Config{
25+
Include: "/var/log/*.log",
26+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
27+
},
2228
wantErr: nil,
2329
},
2430
{
25-
name: "missing include pattern",
26-
cfg: &Config{Include: ""},
31+
name: "missing include pattern",
32+
cfg: &Config{
33+
Include: "",
34+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
35+
},
2736
wantErr: errors.New("include must not be empty"),
2837
},
2938
}

‎receiver/flinkmetricsreceiver/config_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"go.opentelemetry.io/collector/component"
1515
"go.opentelemetry.io/collector/config/confighttp"
1616
"go.opentelemetry.io/collector/confmap/confmaptest"
17+
"go.opentelemetry.io/collector/receiver/scraperhelper"
1718

1819
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver/internal/metadata"
1920
)
@@ -30,6 +31,7 @@ func TestValidate(t *testing.T) {
3031
HTTPClientSettings: confighttp.HTTPClientSettings{
3132
Endpoint: "invalid://endpoint: 12efg",
3233
},
34+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
3335
},
3436
expectedErr: fmt.Errorf("\"endpoint\" must be in the form of <scheme>://<hostname>:<port>: %w", errors.New(`parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`)),
3537
},
@@ -39,6 +41,7 @@ func TestValidate(t *testing.T) {
3941
HTTPClientSettings: confighttp.HTTPClientSettings{
4042
Endpoint: defaultEndpoint,
4143
},
44+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
4245
},
4346
expectedErr: nil,
4447
},

‎receiver/httpcheckreceiver/config_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ import (
99

1010
"github.com/stretchr/testify/require"
1111
"go.opentelemetry.io/collector/config/confighttp"
12+
"go.opentelemetry.io/collector/receiver/scraperhelper"
1213
"go.uber.org/multierr"
14+
15+
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver/internal/metadata"
1316
)
1417

1518
func TestValidate(t *testing.T) {
@@ -26,6 +29,7 @@ func TestValidate(t *testing.T) {
2629
HTTPClientSettings: confighttp.HTTPClientSettings{},
2730
},
2831
},
32+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
2933
},
3034
expectedErr: multierr.Combine(
3135
errMissingEndpoint,
@@ -41,6 +45,7 @@ func TestValidate(t *testing.T) {
4145
},
4246
},
4347
},
48+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
4449
},
4550
expectedErr: multierr.Combine(
4651
fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`),
@@ -61,6 +66,7 @@ func TestValidate(t *testing.T) {
6166
},
6267
},
6368
},
69+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
6470
},
6571
expectedErr: multierr.Combine(
6672
fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`),
@@ -76,6 +82,7 @@ func TestValidate(t *testing.T) {
7682
},
7783
},
7884
},
85+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
7986
},
8087
expectedErr: multierr.Combine(
8188
fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "www.opentelemetry.io/docs": invalid URI for request`),
@@ -96,6 +103,7 @@ func TestValidate(t *testing.T) {
96103
},
97104
},
98105
},
106+
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
99107
},
100108
expectedErr: nil,
101109
},

0 commit comments

Comments
 (0)