[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.
open-telemetry · Jul 28, 2023 · 158ee0e · 158ee0e
1 parent b44a1ba
commit 158ee0e
Show file tree

Hide file tree

Showing 17 changed files with 194 additions and 78 deletions.
diff --git a/receiver/aerospikereceiver/config_test.go b/receiver/aerospikereceiver/config_test.go
@@ -12,6 +12,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/internal/metadata"
 )
@@ -25,67 +26,76 @@ func TestValidate(t *testing.T) {
 		{
 			name: "blank endpoint",
 			config: &Config{
-				Endpoint: "",
+				Endpoint:                  "",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expected: errEmptyEndpoint,
 		},
 		{
 			name: "missing port",
 			config: &Config{
-				Endpoint: "localhost",
+				Endpoint:                  "localhost",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expected: errBadEndpoint,
 		},
 		{
 			name: "bad endpoint",
 			config: &Config{
-				Endpoint: "x;;ef;s;d:::ss:23423423423423423",
+				Endpoint:                  "x;;ef;s;d:::ss:23423423423423423",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expected: errBadEndpoint,
 		},
 		{
 			name: "missing host",
 			config: &Config{
-				Endpoint: ":3001",
+				Endpoint:                  ":3001",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expected: errBadEndpoint,
 		},
 		{
 			name: "negative port",
 			config: &Config{
-				Endpoint: "localhost:-2",
+				Endpoint:                  "localhost:-2",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expected: errBadPort,
 		},
 		{
 			name: "bad port",
 			config: &Config{
-				Endpoint: "localhost:9999999999999999999",
+				Endpoint:                  "localhost:9999999999999999999",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expected: errBadPort,
 		},
 		{
 			name: "negative timeout",
 			config: &Config{
-				Endpoint: "localhost:3000",
-				Timeout:  -1 * time.Second,
+				Endpoint:                  "localhost:3000",
+				Timeout:                   -1 * time.Second,
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expected: errNegativeTimeout,
 		},
 		{
 			name: "password but no username",
 			config: &Config{
-				Endpoint: "localhost:3000",
-				Username: "",
-				Password: "secret",
+				Endpoint:                  "localhost:3000",
+				Username:                  "",
+				Password:                  "secret",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expected: errEmptyUsername,
 		},
 		{
 			name: "username but no password",
 			config: &Config{
-				Endpoint: "localhost:3000",
-				Username: "ro_user",
+				Endpoint:                  "localhost:3000",
+				Username:                  "ro_user",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expected: errEmptyPassword,
 		},
@@ -100,6 +110,7 @@ func TestValidate(t *testing.T) {
 						CAFile: "BADCAFILE",
 					},
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expected: errFailedTLSLoad,
 		},
@@ -112,6 +123,7 @@ func TestValidate(t *testing.T) {
 					Insecure:   false,
 					TLSSetting: configtls.TLSSetting{},
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expected: errEmptyEndpointTLSName,
 		},

diff --git a/receiver/apachesparkreceiver/config_test.go b/receiver/apachesparkreceiver/config_test.go
@@ -8,6 +8,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/config/confighttp"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachesparkreceiver/internal/metadata"
 )
 
 func TestValidate(t *testing.T) {
@@ -17,8 +20,10 @@ func TestValidate(t *testing.T) {
 		expectedErr error
 	}{
 		{
-			desc:        "default config",
-			cfg:         &Config{},
+			desc: "default config",
+			cfg: &Config{
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
+			},
 			expectedErr: nil,
 		},
 		{
@@ -27,6 +32,7 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: "invalid://endpoint  12efg",
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: errInvalidEndpoint,
 		},

diff --git a/receiver/bigipreceiver/config_test.go b/receiver/bigipreceiver/config_test.go
@@ -12,6 +12,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 	"go.uber.org/multierr"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver/internal/metadata"
@@ -33,6 +34,7 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: "invalid://endpoint:  12efg",
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: multierr.Combine(
 				errMissingUsername,
@@ -46,7 +48,7 @@ func TestValidate(t *testing.T) {
 				Username: "otelu",
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: "invalid://endpoint:  12efg",
-				},
+				}, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: multierr.Combine(
 				errMissingPassword,
@@ -60,6 +62,7 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: "invalid://endpoint:  12efg",
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: multierr.Combine(
 				errMissingUsername,
@@ -74,6 +77,7 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: "invalid://endpoint:  12efg",
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: multierr.Combine(
 				fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint:  12efg": invalid port ":  12efg" after host`),
@@ -87,6 +91,7 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: defaultEndpoint,
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: nil,
 		},

diff --git a/receiver/couchdbreceiver/config_test.go b/receiver/couchdbreceiver/config_test.go
@@ -13,6 +13,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 	"go.uber.org/multierr"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver/internal/metadata"
@@ -30,6 +31,7 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: "http://localhost :5984",
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: multierr.Combine(
 				errMissingUsername,
@@ -43,7 +45,8 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: "http://localhost :5984",
 				},
-				Username: "otelu",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
+				Username:                  "otelu",
 			},
 			expectedErr: multierr.Combine(
 				errMissingPassword,
@@ -56,7 +59,8 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: "http://localhost :5984",
 				},
-				Password: "otelp",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
+				Password:                  "otelp",
 			},
 			expectedErr: multierr.Combine(
 				errMissingUsername,
@@ -71,6 +75,7 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: "http://localhost :5984",
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: fmt.Errorf(errInvalidEndpoint.Error(), "parse \"http://localhost :5984\": invalid character \" \" in host name"),
 		},
@@ -82,6 +87,7 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: "http://localhost:5984",
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: nil,
 		},

diff --git a/receiver/dockerstatsreceiver/config_test.go b/receiver/dockerstatsreceiver/config_test.go
@@ -91,12 +91,9 @@ func TestLoadConfig(t *testing.T) {
 }
 
 func TestValidateErrors(t *testing.T) {
-	cfg := &Config{}
+	cfg := &Config{ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type)}
 	assert.Equal(t, "endpoint must be specified", component.ValidateConfig(cfg).Error())
 
-	cfg = &Config{Endpoint: "someEndpoint"}
-	assert.Equal(t, "collection_interval must be a positive duration", component.ValidateConfig(cfg).Error())
-
 	cfg = &Config{ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: 1 * time.Second}, Endpoint: "someEndpoint", DockerAPIVersion: 1.21}
 	assert.Equal(t, "api_version must be at least 1.22", component.ValidateConfig(cfg).Error())
 }
diff --git a/receiver/filestatsreceiver/config_test.go b/receiver/filestatsreceiver/config_test.go
@@ -8,6 +8,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver/internal/metadata"
 )
 
 func Test_Config_Validate(t *testing.T) {
@@ -17,13 +20,19 @@ func Test_Config_Validate(t *testing.T) {
 		wantErr error
 	}{
 		{
-			name:    "valid",
-			cfg:     &Config{Include: "/var/log/*.log"},
+			name: "valid",
+			cfg: &Config{
+				Include:                   "/var/log/*.log",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
+			},
 			wantErr: nil,
 		},
 		{
-			name:    "missing include pattern",
-			cfg:     &Config{Include: ""},
+			name: "missing include pattern",
+			cfg: &Config{
+				Include:                   "",
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
+			},
 			wantErr: errors.New("include must not be empty"),
 		},
 	}

diff --git a/receiver/flinkmetricsreceiver/config_test.go b/receiver/flinkmetricsreceiver/config_test.go
@@ -14,6 +14,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver/internal/metadata"
 )
@@ -30,6 +31,7 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: "invalid://endpoint:  12efg",
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			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`)),
 		},
@@ -39,6 +41,7 @@ func TestValidate(t *testing.T) {
 				HTTPClientSettings: confighttp.HTTPClientSettings{
 					Endpoint: defaultEndpoint,
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: nil,
 		},

diff --git a/receiver/httpcheckreceiver/config_test.go b/receiver/httpcheckreceiver/config_test.go
@@ -9,7 +9,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/config/confighttp"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 	"go.uber.org/multierr"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver/internal/metadata"
 )
 
 func TestValidate(t *testing.T) {
@@ -26,6 +29,7 @@ func TestValidate(t *testing.T) {
 						HTTPClientSettings: confighttp.HTTPClientSettings{},
 					},
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: multierr.Combine(
 				errMissingEndpoint,
@@ -41,6 +45,7 @@ func TestValidate(t *testing.T) {
 						},
 					},
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: multierr.Combine(
 				fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint:  12efg": invalid port ":  12efg" after host`),
@@ -61,6 +66,7 @@ func TestValidate(t *testing.T) {
 						},
 					},
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: multierr.Combine(
 				fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint:  12efg": invalid port ":  12efg" after host`),
@@ -76,6 +82,7 @@ func TestValidate(t *testing.T) {
 						},
 					},
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: multierr.Combine(
 				fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "www.opentelemetry.io/docs": invalid URI for request`),
@@ -96,6 +103,7 @@ func TestValidate(t *testing.T) {
 						},
 					},
 				},
+				ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
 			},
 			expectedErr: nil,
 		},