[chore] Change receiver config tests to unmarshal config only for tha…

…t component. (part2) - [x] hostmetricsreceiver - [x] iisreceiver - [x] influxdbreceiver - [x] jmxreceiver - [x] journaldreceiver - [x] k8sclusterreceiver - [x] k8seventsreceiver - [x] kafkametricsreceiver - [x] kafkareceiver - [x] kubeletstatsreceiver - [x] prometheusexecreceiver
open-telemetry · Sep 28, 2022 · 9fe6d67 · 9fe6d67
1 parent 575c72b
commit 9fe6d67
Show file tree

Hide file tree

Showing 18 changed files with 814 additions and 874 deletions.
diff --git a/receiver/jmxreceiver/config_test.go b/receiver/jmxreceiver/config_test.go
diff --git a/receiver/jmxreceiver/testdata/config.yaml b/receiver/jmxreceiver/testdata/config.yaml
@@ -1,74 +1,60 @@
-receivers:
-  jmx:
-  jmx/all:
-    jar_path: testdata/fake_jmx.jar
-    endpoint: myendpoint:12345
-    target_system: jvm
-    collection_interval: 15s
-    username: myusername
-    password: mypassword
-    otlp:
-      endpoint: myotlpendpoint
-      headers:
-        x-header-1: value1
-        x-header-2: value2
-      timeout: 5s
-    keystore_path: mykeystorepath
-    keystore_password: mykeystorepassword
-    keystore_type: mykeystoretype
-    truststore_path: mytruststorepath
-    truststore_password: mytruststorepassword
-    remote_profile: myremoteprofile
-    realm: myrealm
-    log_level: trace
-    resource_attributes:
-      one: two
-    additional_jars:
-      - testdata/fake_additional.jar
-  jmx/missingendpoint:
-    jar_path: testdata/fake_jmx.jar
-    target_system: jvm
-  jmx/missingtarget:
-    jar_path: testdata/fake_jmx.jar
-    endpoint: service:jmx:rmi:///jndi/rmi://host:12345/jmxrmi
-  jmx/invalidinterval:
-    jar_path: testdata/fake_jmx.jar
-    endpoint: myendpoint:23456
-    target_system: jvm
-    collection_interval: -100ms
-  jmx/invalidotlptimeout:
-    jar_path: testdata/fake_jmx.jar
-    endpoint: myendpoint:34567
-    target_system: jvm
-    otlp:
-      timeout: -100ms
-  jmx/nonexistentjar:
-    jar_path: testdata/file_does_not_exist.jar
-    endpoint: myendpoint:23456
-    target_system: jvm
-  jmx/invalidjar:
-    jar_path: testdata/fake_jmx_wrong.jar
-    endpoint: myendpoint:23456
-    target_system: jvm
-  jmx/invalidloglevel:
-    jar_path: testdata/fake_jmx.jar
-    endpoint: myendpoint:55555
-    target_system: jvm
-    log_level: truth
-  jmx/invalidtargetsystem:
-    jar_path: testdata/fake_jmx.jar
-    endpoint: myendpoint:55555
-    target_system: jvm,fakejvmtechnology
-
-processors:
-  nop:
-
-exporters:
-  nop:
-
-service:
-  pipelines:
-    metrics:
-      receivers: [jmx, jmx/all]
-      processors: [nop]
-      exporters: [nop]
+jmx:
+jmx/all:
+  jar_path: testdata/fake_jmx.jar
+  endpoint: myendpoint:12345
+  target_system: jvm
+  collection_interval: 15s
+  username: myusername
+  password: mypassword
+  otlp:
+    endpoint: myotlpendpoint
+    headers:
+      x-header-1: value1
+      x-header-2: value2
+    timeout: 5s
+  keystore_path: mykeystorepath
+  keystore_password: mykeystorepassword
+  keystore_type: mykeystoretype
+  truststore_path: mytruststorepath
+  truststore_password: mytruststorepassword
+  remote_profile: myremoteprofile
+  realm: myrealm
+  log_level: trace
+  resource_attributes:
+    one: two
+  additional_jars:
+    - testdata/fake_additional.jar
+jmx/missingendpoint:
+  jar_path: testdata/fake_jmx.jar
+  target_system: jvm
+jmx/missingtarget:
+  jar_path: testdata/fake_jmx.jar
+  endpoint: service:jmx:rmi:///jndi/rmi://host:12345/jmxrmi
+jmx/invalidinterval:
+  jar_path: testdata/fake_jmx.jar
+  endpoint: myendpoint:23456
+  target_system: jvm
+  collection_interval: -100ms
+jmx/invalidotlptimeout:
+  jar_path: testdata/fake_jmx.jar
+  endpoint: myendpoint:34567
+  target_system: jvm
+  otlp:
+    timeout: -100ms
+jmx/nonexistentjar:
+  jar_path: testdata/file_does_not_exist.jar
+  endpoint: myendpoint:23456
+  target_system: jvm
+jmx/invalidjar:
+  jar_path: testdata/fake_jmx_wrong.jar
+  endpoint: myendpoint:23456
+  target_system: jvm
+jmx/invalidloglevel:
+  jar_path: testdata/fake_jmx.jar
+  endpoint: myendpoint:55555
+  target_system: jvm
+  log_level: truth
+jmx/invalidtargetsystem:
+  jar_path: testdata/fake_jmx.jar
+  endpoint: myendpoint:55555
+  target_system: jvm,fakejvmtechnology
diff --git a/receiver/journaldreceiver/journald_test.go b/receiver/journaldreceiver/journald_test.go
@@ -26,27 +26,25 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/consumer/consumertest"
-	"go.opentelemetry.io/collector/service/servicetest"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/input/journald"
 )
 
 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)
+	cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
 	require.NoError(t, err)
-	require.NotNil(t, cfg)
+	factory := NewFactory()
+	cfg := factory.CreateDefaultConfig()
 
-	assert.Equal(t, len(cfg.Receivers), 1)
+	sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String())
+	require.NoError(t, err)
+	require.NoError(t, config.UnmarshalReceiver(sub, cfg))
 
-	assert.Equal(t, testdataConfigYaml(), cfg.Receivers[config.NewComponentID("journald")])
+	assert.Equal(t, testdataConfigYaml(), cfg)
 }
 
 func TestInputConfigFailure(t *testing.T) {

diff --git a/receiver/journaldreceiver/testdata/config.yaml b/receiver/journaldreceiver/testdata/config.yaml
@@ -1,19 +1,5 @@
-receivers:
-  journald:
-    units:
-      - ssh
-    priority: info
-    directory: /run/log/journal
-
-processors:
-  nop:
-
-exporters:
-  nop:
-
-service:
-  pipelines:
-    logs:
-      receivers: [journald]
-      processors: [nop]
-      exporters: [nop]
+journald:
+  units:
+    - ssh
+  priority: info
+  directory: /run/log/journal
diff --git a/receiver/k8sclusterreceiver/config_test.go b/receiver/k8sclusterreceiver/config_test.go
@@ -21,55 +21,68 @@ 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"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig"
 )
 
 func TestLoadConfig(t *testing.T) {
-	factories, err := componenttest.NopFactories()
-	assert.Nil(t, err)
-
-	factory := NewFactory()
-	receiverType := "k8s_cluster"
-	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), 3)
+	tests := []struct {
+		id          config.ComponentID
+		expected    config.Receiver
+		expectedErr error
+	}{
+		{
+			id:       config.NewComponentIDWithName(typeStr, ""),
+			expected: createDefaultConfig(),
+		},
+		{
+			id: config.NewComponentIDWithName(typeStr, "all_settings"),
+			expected: &Config{
+				ReceiverSettings:           config.NewReceiverSettings(config.NewComponentID(typeStr)),
+				Distribution:               distributionKubernetes,
+				CollectionInterval:         30 * time.Second,
+				NodeConditionTypesToReport: []string{"Ready", "MemoryPressure"},
+				AllocatableTypesToReport:   []string{"cpu", "memory"},
+				MetadataExporters:          []string{"nop"},
+				APIConfig: k8sconfig.APIConfig{
+					AuthType: k8sconfig.AuthTypeServiceAccount,
+				},
+			},
+		},
+		{
+			id: config.NewComponentIDWithName(typeStr, "partial_settings"),
+			expected: &Config{
+				ReceiverSettings:           config.NewReceiverSettings(config.NewComponentID(typeStr)),
+				Distribution:               distributionOpenShift,
+				CollectionInterval:         30 * time.Second,
+				NodeConditionTypesToReport: []string{"Ready"},
+				APIConfig: k8sconfig.APIConfig{
+					AuthType: k8sconfig.AuthTypeServiceAccount,
+				},
+			},
+		},
+	}
 
-	r1 := cfg.Receivers[config.NewComponentID(typeStr)]
-	assert.Equal(t, r1, factory.CreateDefaultConfig())
+	for _, tt := range tests {
+		t.Run(tt.id.String(), func(t *testing.T) {
+			factory := NewFactory()
+			cfg := factory.CreateDefaultConfig()
 
-	r2 := cfg.Receivers[config.NewComponentIDWithName(typeStr, "all_settings")].(*Config)
-	assert.Equal(t, r2,
-		&Config{
-			ReceiverSettings:           config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "all_settings")),
-			Distribution:               distributionKubernetes,
-			CollectionInterval:         30 * time.Second,
-			NodeConditionTypesToReport: []string{"Ready", "MemoryPressure"},
-			AllocatableTypesToReport:   []string{"cpu", "memory"},
-			MetadataExporters:          []string{"nop"},
-			APIConfig: k8sconfig.APIConfig{
-				AuthType: k8sconfig.AuthTypeServiceAccount,
-			},
-		})
+			sub, err := cm.Sub(tt.id.String())
+			require.NoError(t, err)
+			require.NoError(t, config.UnmarshalReceiver(sub, cfg))
 
-	r3 := cfg.Receivers[config.NewComponentIDWithName(typeStr, "partial_settings")].(*Config)
-	assert.Equal(t, r3,
-		&Config{
-			ReceiverSettings:           config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "partial_settings")),
-			Distribution:               distributionOpenShift,
-			CollectionInterval:         30 * time.Second,
-			NodeConditionTypesToReport: []string{"Ready"},
-			APIConfig: k8sconfig.APIConfig{
-				AuthType: k8sconfig.AuthTypeServiceAccount,
-			},
+			assert.NoError(t, cfg.Validate())
+			assert.Equal(t, tt.expected, cfg)
 		})
+	}
 }
 
 func TestInvalidConfig(t *testing.T) {

diff --git a/receiver/k8sclusterreceiver/testdata/config.yaml b/receiver/k8sclusterreceiver/testdata/config.yaml
@@ -1,24 +1,9 @@
-receivers:
-  k8s_cluster:
-  k8s_cluster/all_settings:
-    collection_interval: 30s
-    node_conditions_to_report: ["Ready", "MemoryPressure"]
-    allocatable_types_to_report: ["cpu","memory"]
-    metadata_exporters: [nop]
-  k8s_cluster/partial_settings:
-    collection_interval: 30s
-    distribution: openshift
-
-
-processors:
-  nop:
-
-exporters:
-  nop:
-
-service:
-  pipelines:
-    metrics:
-      receivers: [k8s_cluster]
-      processors: [nop]
-      exporters: [nop]
+k8s_cluster:
+k8s_cluster/all_settings:
+  collection_interval: 30s
+  node_conditions_to_report: [ "Ready", "MemoryPressure" ]
+  allocatable_types_to_report: [ "cpu","memory" ]
+  metadata_exporters: [ nop ]
+k8s_cluster/partial_settings:
+  collection_interval: 30s
+  distribution: openshift