Fix unit tests.

Signed-off-by: sudipto baral <[email protected]>

Author: sudiptob2

otelcol/collector.go

@@ -286,8 +286,6 @@ func (col *Collector) DryRun(ctx context.Context) error {
 		ExportersFactories:  factories.Exporters,
 		ConnectorsConfigs:   cfg.Connectors,
 		ConnectorsFactories: factories.Connectors,
-		ExtensionsConfigs:   cfg.Extensions,
-		ExtensionsFactories: factories.Extensions,
 	}, service.Config{
 		Pipelines: cfg.Service.Pipelines,
 	})

otelcol/unmarshal_dry_run_test.go

@@ -71,6 +71,7 @@ func TestDryRunWithExpandedValues(t *testing.T) {
 			mockMap: map[string]string{
 				"number": "123",
 			},
+			expectErr: true,
 		},
 		{
 			name:       "string that looks like a bool",

service/service.go

@@ -14,7 +14,9 @@ import (
 	config "go.opentelemetry.io/contrib/otelconf/v0.3.0"
 	"go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/metric"
+	noopmetric "go.opentelemetry.io/otel/metric/noop"
 	sdkresource "go.opentelemetry.io/otel/sdk/resource"
+	nooptrace "go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 
@@ -538,7 +540,14 @@ func ptr[T any](v T) *T {
 
 // ValidateGraph verifies the graph by calling the internal graph.Build.
 func ValidateGraph(ctx context.Context, set Settings, cfg Config) error {
+	tel := component.TelemetrySettings{
+		Logger:         zap.NewNop(),
+		TracerProvider: nooptrace.NewTracerProvider(),
+		MeterProvider:  noopmetric.NewMeterProvider(),
+		Resource:       pcommon.NewResource(),
+	}
 	_, err := graph.Build(ctx, graph.Settings{
+		Telemetry:        tel,
 		BuildInfo:        set.BuildInfo,
 		ReceiverBuilder:  builders.NewReceiver(set.ReceiversConfigs, set.ReceiversFactories),
 		ProcessorBuilder: builders.NewProcessor(set.ProcessorsConfigs, set.ProcessorsFactories),

service/service_test.go

@@ -745,13 +745,66 @@ func newPtr[T int | string](str T) *T {
 func TestValidateGraph(t *testing.T) {
 	testCases := map[string]struct {
 		connectorCfg  map[component.ID]component.Config
+		receiverCfg   map[component.ID]component.Config
+		exporterCfg   map[component.ID]component.Config
 		pipelinesCfg  pipelines.Config
 		expectedError string
 	}{
+		"Valid connector usage": {
+			connectorCfg: map[component.ID]component.Config{
+				component.NewIDWithName(nopType, "connector1"): &struct{}{},
+			},
+			receiverCfg: map[component.ID]component.Config{
+				component.NewID(nopType): &struct{}{},
+			},
+			exporterCfg: map[component.ID]component.Config{
+				component.NewID(nopType): &struct{}{},
+			},
+			pipelinesCfg: pipelines.Config{
+				pipeline.NewIDWithName(pipeline.SignalLogs, "in"): {
+					Receivers:  []component.ID{component.NewID(nopType)},
+					Processors: []component.ID{},
+					Exporters:  []component.ID{component.NewIDWithName(nopType, "connector1")},
+				},
+				pipeline.NewIDWithName(pipeline.SignalLogs, "out"): {
+					Receivers:  []component.ID{component.NewIDWithName(nopType, "connector1")},
+					Processors: []component.ID{},
+					Exporters:  []component.ID{component.NewID(nopType)},
+				},
+			},
+			expectedError: "",
+		},
+		"Valid without Connector": {
+			receiverCfg: map[component.ID]component.Config{
+				component.NewID(nopType): &struct{}{},
+			},
+			exporterCfg: map[component.ID]component.Config{
+				component.NewID(nopType): &struct{}{},
+			},
+			pipelinesCfg: pipelines.Config{
+				pipeline.NewIDWithName(pipeline.SignalLogs, "in"): {
+					Receivers:  []component.ID{component.NewID(nopType)},
+					Processors: []component.ID{},
+					Exporters:  []component.ID{component.NewID(nopType)},
+				},
+				pipeline.NewIDWithName(pipeline.SignalLogs, "out"): {
+					Receivers:  []component.ID{component.NewID(nopType)},
+					Processors: []component.ID{},
+					Exporters:  []component.ID{component.NewID(nopType)},
+				},
+			},
+			expectedError: "",
+		},
 		"Connector used as exporter but not as receiver": {
 			connectorCfg: map[component.ID]component.Config{
 				component.NewIDWithName(nopType, "connector1"): &struct{}{},
 			},
+			receiverCfg: map[component.ID]component.Config{
+				component.NewID(nopType): &struct{}{},
+			},
+			exporterCfg: map[component.ID]component.Config{
+				component.NewID(nopType): &struct{}{},
+			},
 			pipelinesCfg: pipelines.Config{
 				pipeline.NewIDWithName(pipeline.SignalLogs, "in1"): {
 					Receivers:  []component.ID{component.NewID(nopType)},
@@ -775,6 +828,12 @@ func TestValidateGraph(t *testing.T) {
 			connectorCfg: map[component.ID]component.Config{
 				component.NewIDWithName(nopType, "connector1"): &struct{}{},
 			},
+			receiverCfg: map[component.ID]component.Config{
+				component.NewID(nopType): &struct{}{},
+			},
+			exporterCfg: map[component.ID]component.Config{
+				component.NewID(nopType): &struct{}{},
+			},
 			pipelinesCfg: pipelines.Config{
 				pipeline.NewIDWithName(pipeline.SignalLogs, "in1"): {
 					Receivers:  []component.ID{component.NewID(nopType)},
@@ -794,23 +853,57 @@ func TestValidateGraph(t *testing.T) {
 			},
 			expectedError: `failed to build pipelines: connector "nop/connector1" used as receiver in [logs/in2] pipeline but not used in any supported exporter pipeline`,
 		},
+		"Connector creates direct cycle between pipelines": {
+			connectorCfg: map[component.ID]component.Config{
+				component.NewIDWithName(nopType, "forward"): &struct{}{},
+			},
+			receiverCfg: map[component.ID]component.Config{
+				component.NewID(nopType): &struct{}{},
+			},
+			exporterCfg: map[component.ID]component.Config{
+				component.NewID(nopType): &struct{}{},
+			},
+			pipelinesCfg: pipelines.Config{
+				pipeline.NewIDWithName(pipeline.SignalTraces, "in"): {
+					Receivers:  []component.ID{component.NewIDWithName(nopType, "forward")},
+					Processors: []component.ID{},
+					Exporters:  []component.ID{component.NewIDWithName(nopType, "forward")},
+				},
+				pipeline.NewIDWithName(pipeline.SignalTraces, "out"): {
+					Receivers:  []component.ID{component.NewIDWithName(nopType, "forward")},
+					Processors: []component.ID{},
+					Exporters:  []component.ID{component.NewIDWithName(nopType, "forward")},
+				},
+			},
+			expectedError: `failed to build pipelines: cycle detected: connector "nop/forward" (traces to traces) -> connector "nop/forward" (traces to traces)`,
+		},
 	}
 
 	_, connectorsFactories := builders.NewNopConnectorConfigsAndFactories()
+	_, receiversFactories := builders.NewNopReceiverConfigsAndFactories()
+	_, exportersFactories := builders.NewNopExporterConfigsAndFactories()
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
 			settings := Settings{
 				ConnectorsConfigs:   tc.connectorCfg,
 				ConnectorsFactories: connectorsFactories,
+				ReceiversConfigs:    tc.receiverCfg,
+				ReceiversFactories:  receiversFactories,
+				ExportersConfigs:    tc.exporterCfg,
+				ExportersFactories:  exportersFactories,
 			}
 			cfg := Config{
 				Pipelines: tc.pipelinesCfg,
 			}
 
 			err := ValidateGraph(context.Background(), settings, cfg)
-			require.Error(t, err)
-			assert.Equal(t, tc.expectedError, err.Error())
+			if tc.expectedError == "" {
+				require.NoError(t, err)
+			} else {
+				require.Error(t, err)
+				assert.Equal(t, tc.expectedError, err.Error())
+			}
 		})
 	}
 }