Fix based on PR comments

cmd/occollector/app/builder/receivers_builder.go

@@ -198,7 +198,7 @@ func (rb *ReceiversBuilder) attachReceiverToPipelines(
  if err == factories.ErrDataTypeIsNotSupported {
  return fmt.Errorf(
  "receiver %s does not support %s but some pipelines that "+
- "want to process %s are attached to the receiever",
+ "want to process %s are attached to the receiver",
  config.Name(),
  dataType.GetString(),
  dataType.GetString())

cmd/occollector/app/builder/receivers_builder_test.go

@@ -195,23 +195,23 @@ func testReceivers(
  }
 }
 
-func TestReceiversBuilder_Error(t *testing.T) {
- //config, err := configv2.LoadConfigFile(t, "testdata/pipelines_builder.yaml")
- //require.Nil(t, err)
- //
- //// Corrupt the pipeline, change data type to metrics. We have to forcedly do it here
- //// since there is no way to have such config loaded by LoadConfigFile, it would not
- //// pass validation. We are doing this to test failure mode of PipelinesBuilder.
- //pipeline := config.Pipelines["traces"]
- //pipeline.InputType = configmodels.MetricsDataType
- //
- //exporters, err := NewExportersBuilder(zap.NewNop(), config).Build()
- //
- //// This should fail because "attributes" processor defined in the config does
- //// not support metrics data type.
- //_, err = NewPipelinesBuilder(zap.NewNop(), config, exporters).Build()
- //
- //assert.NotNil(t, err)
+func TestReceiversBuilder_DataTypeError(t *testing.T) {
+ config, err := configv2.LoadConfigFile(t, "testdata/pipelines_builder.yaml")
+ require.Nil(t, err)
+
+ // Make examplereceiver to "unsupport" trace data type.
+ receiver := config.Receivers["examplereceiver"]
+ receiver.(*configv2.ExampleReceiver).FailTraceCreation = true
+
+ // Build the pipeline
+ allExporters, err := NewExportersBuilder(zap.NewNop(), config).Build()
+ pipelineProcessors, err := NewPipelinesBuilder(zap.NewNop(), config, allExporters).Build()
+ receivers, err := NewReceiversBuilder(zap.NewNop(), config, pipelineProcessors).Build()
+
+ // This should fail because "examplereceiver" is attached to "traces" pipeline
+ // which is a configuration error.
+ assert.NotNil(t, err)
+ assert.Nil(t, receivers)
 }
 
 func TestReceiversBuilder_StartAll(t *testing.T) {

cmd/occollector/app/builder/testdata/pipelines_builder.yaml

@@ -45,3 +45,4 @@ pipelines:
  metrics/3:
  receivers: [examplereceiver/3]
  exporters: [exampleexporter/2]
+

internal/configmodels/configmodels.go

@@ -134,12 +134,12 @@ type ReceiverSettings struct {
  Endpoint string `mapstructure:"endpoint"`
 }
 
-// Name gets the exporter name.
+// Name gets the receiver name.
 func (rs *ReceiverSettings) Name() string {
  return rs.NameVal
 }
 
-// SetName sets the exporter name.
+// SetName sets the receiver name.
 func (rs *ReceiverSettings) SetName(name string) {
  rs.NameVal = name
 }

internal/configv2/example_factories.go

@@ -30,6 +30,12 @@ import (
 type ExampleReceiver struct {
  configmodels.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct
  ExtraSetting string `mapstructure:"extra"`
+
+ // FailTraceCreation causes CreateTraceReceiver to fail. Useful for testing.
+ FailTraceCreation bool `mapstructure:"-"`
+
+ // FailMetricsCreation causes CreateTraceReceiver to fail. Useful for testing.
+ FailMetricsCreation bool `mapstructure:"-"`
 }
 
 // ExampleReceiverFactory is factory for ExampleReceiver.
@@ -64,7 +70,9 @@ func (f *ExampleReceiverFactory) CreateTraceReceiver(
  cfg configmodels.Receiver,
  nextConsumer consumer.TraceConsumer,
 ) (receiver.TraceReceiver, error) {
- // Not used for this test, just return nil
+ if cfg.(*ExampleReceiver).FailTraceCreation {
+ return nil, factories.ErrDataTypeIsNotSupported
+ }
  return &ExampleReceiverProducer{TraceConsumer: nextConsumer}, nil
 }
 
@@ -73,7 +81,9 @@ func (f *ExampleReceiverFactory) CreateMetricsReceiver(
  cfg configmodels.Receiver,
  nextConsumer consumer.MetricsConsumer,
 ) (receiver.MetricsReceiver, error) {
- // Not used for this test, just return nil
+ if cfg.(*ExampleReceiver).FailMetricsCreation {
+ return nil, factories.ErrDataTypeIsNotSupported
+ }
  return &ExampleReceiverProducer{MetricsConsumer: nextConsumer}, nil
 }