Move Timeout parameter to ScraperControllerSettings

open-telemetry · Aug 25, 2023 · 2e6f18e · 2e6f18e
1 parent 297448d
commit 2e6f18e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/receiver/snmpreceiver/config.go b/receiver/snmpreceiver/config.go
@@ -77,10 +77,6 @@ type Config struct {
 	// If no port is given, 161 is assumed.
 	Endpoint string `mapstructure:"endpoint"`
 
-	// Timeout for each SNMP request.
-	// Default: 5 seconds
-	Timeout time.Duration `mapstructure:"timeout"`
-
 	// Version is the version of SNMP to use for this connection.
 	// Valid options: v1, v2c, v3.
 	// Default: v2c

diff --git a/receiver/snmpreceiver/factory.go b/receiver/snmpreceiver/factory.go
@@ -33,9 +33,9 @@ func createDefaultConfig() component.Config {
 	return &Config{
 		ScraperControllerSettings: scraperhelper.ScraperControllerSettings{
 			CollectionInterval: defaultCollectionInterval,
+			Timeout:            defaultTimeout,
 		},
 		Endpoint:      defaultEndpoint,
-		Timeout:       defaultTimeout,
 		Version:       defaultVersion,
 		Community:     defaultCommunity,
 		SecurityLevel: defaultSecurityLevel,

diff --git a/receiver/snmpreceiver/factory_test.go b/receiver/snmpreceiver/factory_test.go
@@ -36,9 +36,9 @@ func TestNewFactory(t *testing.T) {
 				var expectedCfg component.Config = &Config{
 					ScraperControllerSettings: scraperhelper.ScraperControllerSettings{
 						CollectionInterval: defaultCollectionInterval,
+						Timeout:            defaultTimeout,
 					},
 					Endpoint:      defaultEndpoint,
-					Timeout:       defaultTimeout,
 					Version:       defaultVersion,
 					Community:     defaultCommunity,
 					SecurityLevel: "no_auth_no_priv",