[chore] Change receiver config tests to unmarshal config only for that component.

receiver/activedirectorydsreceiver/config_test.go

@@ -19,37 +19,54 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config"
-	"go.opentelemetry.io/collector/service/servicetest"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver/internal/metadata"
 )
 
 func TestLoadConfig(t *testing.T) {
 	t.Parallel()
 
-	factories, err := componenttest.NopFactories()
-	require.NoError(t, err)
-
-	factory := NewFactory()
-	factories.Receivers[typeStr] = factory
-	cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories)
+	cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
 	require.NoError(t, err)
-	require.NotNil(t, cfg)
-
-	require.Equal(t, len(cfg.Receivers), 2)
-	defaultRecvID := config.NewComponentIDWithName(typeStr, "defaults")
 
-	defaultCfg := factory.CreateDefaultConfig().(*Config)
-	defaultCfg.ReceiverSettings.SetIDName(defaultRecvID.Name())
-	defaultReceiver := cfg.Receivers[defaultRecvID]
-	require.Equal(t, defaultCfg, defaultReceiver)
+	defaultMetricsSettings := metadata.DefaultMetricsSettings()
+	defaultMetricsSettings.ActiveDirectoryDsReplicationObjectRate.Enabled = false
+	tests := []struct {
+		id       config.ComponentID
+		expected config.Receiver
+	}{
+		{
+			id:       config.NewComponentIDWithName(typeStr, "defaults"),
+			expected: createDefaultConfig(),
+		},
+		{
+			id: config.NewComponentIDWithName(typeStr, ""),
+			expected: &Config{
+				ScraperControllerSettings: scraperhelper.ScraperControllerSettings{
+					ReceiverSettings:   config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "")),
+					CollectionInterval: 2 * time.Minute,
+				},
+				Metrics: defaultMetricsSettings,
+			},
+		},
+	}
 
-	advancedRecv := cfg.Receivers[config.NewComponentID(typeStr)]
-	expectedAdvancedRecv := factory.CreateDefaultConfig().(*Config)
+	for _, tt := range tests {
+		t.Run(tt.id.String(), func(t *testing.T) {
+			factory := NewFactory()
+			cfg := factory.CreateDefaultConfig()
 
-	expectedAdvancedRecv.Metrics.ActiveDirectoryDsReplicationObjectRate.Enabled = false
-	expectedAdvancedRecv.ScraperControllerSettings.CollectionInterval = 2 * time.Minute
+			sub, err := cm.Sub(tt.id.String())
+			require.NoError(t, err)
+			require.NoError(t, config.UnmarshalReceiver(sub, cfg))
 
-	require.Equal(t, expectedAdvancedRecv, advancedRecv)
+			assert.NoError(t, cfg.Validate())
+			assert.Equal(t, tt.expected, cfg)
+		})
+	}
 }

receiver/activedirectorydsreceiver/testdata/config.yaml

@@ -1,20 +1,6 @@
-receivers:
-  active_directory_ds:
-    collection_interval: 2m
-    metrics:
-      active_directory.ds.replication.object.rate:
-        enabled: false
-  active_directory_ds/defaults:
-
-processors:
-  nop:
-
-exporters:
-  nop:
-
-service:
-  pipelines:
-    metrics:
-      receivers: [active_directory_ds]
-      processors: [nop]
-      exporters: [nop]
+active_directory_ds:
+  collection_interval: 2m
+  metrics:
+    active_directory.ds.replication.object.rate:
+      enabled: false
+active_directory_ds/defaults:

receiver/aerospikereceiver/testdata/config.yaml

@@ -1,6 +1,5 @@
-receivers:
-    aerospike:
-        endpoint: "localhost:3000"
-        tlsname: ""
-        collect_cluster_metrics: false
-        collection_interval: 30s
+aerospike:
+  endpoint: "localhost:3000"
+  tlsname: ""
+  collect_cluster_metrics: false
+  collection_interval: 30s

receiver/apachereceiver/testdata/config.yaml

@@ -1,17 +1,3 @@
-receivers:
-  apache:
-    endpoint: "http://localhost:8080/server-status?auto"
-    collection_interval: 10s
-
-processors:
-  nop:
-
-exporters:
-  nop:
-
-service:
-  pipelines:
-    metrics:
-      receivers: [apache]
-      processors: [nop]
-      exporters: [nop]
+apache:
+  endpoint: "http://localhost:8080/server-status?auto"
+  collection_interval: 10s

receiver/awscontainerinsightreceiver/config_test.go

@@ -22,38 +22,47 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config"
-	"go.opentelemetry.io/collector/service/servicetest"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
 )
 
 func TestLoadConfig(t *testing.T) {
-	factories, err := componenttest.NopFactories()
-	assert.Nil(t, err)
-
-	factory := NewFactory()
-	factories.Receivers[typeStr] = factory
-	cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories)
+	t.Parallel()
 
+	cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
 	require.NoError(t, err)
-	require.NotNil(t, cfg)
 
-	assert.Equal(t, len(cfg.Receivers), 2)
+	tests := []struct {
+		id       config.ComponentID
+		expected config.Receiver
+	}{
+		{
+			id:       config.NewComponentIDWithName(typeStr, ""),
+			expected: createDefaultConfig(),
+		},
+		{
+			id: config.NewComponentIDWithName(typeStr, "collection_interval_settings"),
+			expected: &Config{
+				ReceiverSettings:      config.NewReceiverSettings(config.NewComponentID(typeStr)),
+				CollectionInterval:    60 * time.Second,
+				ContainerOrchestrator: "eks",
+				TagService:            true,
+				PrefFullPodName:       false,
+			},
+		},
+	}
 
-	//ensure default configurations are generated when users provide nothing
-	r0 := cfg.Receivers[config.NewComponentID(typeStr)]
-	assert.Equal(t, factory.CreateDefaultConfig(), r0)
+	for _, tt := range tests {
+		t.Run(tt.id.String(), func(t *testing.T) {
+			factory := NewFactory()
+			cfg := factory.CreateDefaultConfig()
 
-	r1 := cfg.Receivers[config.NewComponentID(typeStr)]
-	assert.Equal(t, r1, factory.CreateDefaultConfig())
+			sub, err := cm.Sub(tt.id.String())
+			require.NoError(t, err)
+			require.NoError(t, config.UnmarshalReceiver(sub, cfg))
 
-	r2 := cfg.Receivers[config.NewComponentIDWithName(typeStr, "collection_interval_settings")].(*Config)
-	assert.Equal(t, r2,
-		&Config{
-			ReceiverSettings:      config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "collection_interval_settings")),
-			CollectionInterval:    60 * time.Second,
-			ContainerOrchestrator: "eks",
-			TagService:            true,
-			PrefFullPodName:       false,
+			assert.NoError(t, cfg.Validate())
+			assert.Equal(t, tt.expected, cfg)
 		})
+	}
 }

receiver/awscontainerinsightreceiver/testdata/config.yaml

@@ -1,14 +1,4 @@
-receivers:
-  awscontainerinsightreceiver:
-    container_orchestrator: eks
-  awscontainerinsightreceiver/collection_interval_settings:
-    collection_interval: 60s
-
-exporters:
-  nop:
-
-service:
-  pipelines:
-    metrics:
-      receivers: [awscontainerinsightreceiver]
-      exporters: [nop]
+awscontainerinsightreceiver:
+  container_orchestrator: eks
+awscontainerinsightreceiver/collection_interval_settings:
+  collection_interval: 60s

receiver/awsecscontainermetricsreceiver/config_test.go

@@ -21,32 +21,44 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config"
-	"go.opentelemetry.io/collector/service/servicetest"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
 )
 
 func TestLoadConfig(t *testing.T) {
-	factories, err := componenttest.NopFactories()
-	assert.Nil(t, err)
-
-	factory := NewFactory()
-	receiverType := "awsecscontainermetrics"
-	factories.Receivers[config.Type(receiverType)] = factory
-	cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories)
+	t.Parallel()
 
+	cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
 	require.NoError(t, err)
-	require.NotNil(t, cfg)
 
-	assert.Equal(t, len(cfg.Receivers), 2)
+	tests := []struct {
+		id       config.ComponentID
+		expected config.Receiver
+	}{
+		{
+			id:       config.NewComponentIDWithName(typeStr, ""),
+			expected: createDefaultConfig(),
+		},
+		{
+			id: config.NewComponentIDWithName(typeStr, "collection_interval_settings"),
+			expected: &Config{
+				ReceiverSettings:   config.NewReceiverSettings(config.NewComponentID(typeStr)),
+				CollectionInterval: 10 * time.Second,
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.id.String(), func(t *testing.T) {
+			factory := NewFactory()
+			cfg := factory.CreateDefaultConfig()
 
-	r1 := cfg.Receivers[config.NewComponentID(typeStr)]
-	assert.Equal(t, r1, factory.CreateDefaultConfig())
+			sub, err := cm.Sub(tt.id.String())
+			require.NoError(t, err)
+			require.NoError(t, config.UnmarshalReceiver(sub, cfg))
 
-	r2 := cfg.Receivers[config.NewComponentIDWithName(typeStr, "collection_interval_settings")].(*Config)
-	assert.Equal(t, r2,
-		&Config{
-			ReceiverSettings:   config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "collection_interval_settings")),
-			CollectionInterval: 10 * time.Second,
+			assert.NoError(t, cfg.Validate())
+			assert.Equal(t, tt.expected, cfg)
 		})
+	}
 }

receiver/awsecscontainermetricsreceiver/testdata/config.yaml

@@ -1,13 +1,3 @@
-receivers:
-  awsecscontainermetrics:
-  awsecscontainermetrics/collection_interval_settings:
-    collection_interval: 10s
-
-exporters:
-  nop:
-
-service:
-  pipelines:
-    metrics:
-      receivers: [awsecscontainermetrics]
-      exporters: [nop]
+awsecscontainermetrics:
+awsecscontainermetrics/collection_interval_settings:
+  collection_interval: 10s

receiver/awsfirehosereceiver/config_test.go

@@ -18,25 +18,27 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/configtls"
-	"go.opentelemetry.io/collector/service/servicetest"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
 )
 
 func TestLoadConfig(t *testing.T) {
-	factories, err := componenttest.NopFactories()
-	require.Nil(t, err)
+	cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
+	require.NoError(t, err)
 
 	factory := NewFactory()
-	factories.Receivers[typeStr] = factory
-	cfg, err := servicetest.LoadConfigAndValidate(filepath.Join(".", "testdata", "config.yaml"), factories)
+	cfg := factory.CreateDefaultConfig()
+
+	sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String())
 	require.NoError(t, err)
-	require.Equal(t, 1, len(cfg.Receivers))
+	require.NoError(t, config.UnmarshalReceiver(sub, cfg))
+
+	assert.NoError(t, cfg.Validate())
 
-	r := cfg.Receivers[config.NewComponentID(typeStr)].(*Config)
 	require.Equal(t, &Config{
 		ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)),
 		RecordType:       "cwmetrics",
@@ -50,5 +52,5 @@ func TestLoadConfig(t *testing.T) {
 				},
 			},
 		},
-	}, r)
+	}, cfg)
 }

receiver/awsfirehosereceiver/testdata/config.yaml

@@ -1,21 +1,7 @@
-receivers:
-  awsfirehose:
-    endpoint: 0.0.0.0:4433
-    record_type: cwmetrics
-    access_key: "some_access_key"
-    tls:
-      cert_file: server.crt
-      key_file: server.key
-
-processors:
-  nop:
-
-exporters:
-  nop:
-
-service:
-  pipelines:
-    metrics:
-      receivers: [awsfirehose]
-      processors: [nop]
-      exporters: [nop]
+awsfirehose:
+  endpoint: 0.0.0.0:4433
+  record_type: cwmetrics
+  access_key: "some_access_key"
+  tls:
+    cert_file: server.crt
+    key_file: server.key