Verify ConfigProvider and ConfigProviderSettings aren't both passed

otelcol/collector.go

@@ -7,6 +7,7 @@ package otelcol // import "go.opentelemetry.io/collector/otelcol"
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"os/signal"
@@ -120,6 +121,11 @@ func NewCollector(set CollectorSettings) (*Collector, error) {
 		if err != nil {
 			return nil, err
 		}
+	} else {
+		resolverSettings := set.ConfigProviderSettings.ResolverSettings
+		if len(resolverSettings.Converters) != 0 || len(resolverSettings.Providers) != 0 || len(resolverSettings.URIs) != 0 {
+			return nil, errors.New("only one of ConfigProvider or ConfigProviderSettings may be specified")
+		}
 	}
 
 	state := &atomic.Int32{}

otelcol/collector_test.go

@@ -287,6 +287,18 @@ func TestCollectorStartInvalidConfig(t *testing.T) {
 	assert.Error(t, col.Run(context.Background()))
 }
 
+func TestNewCollectorCantSpecifyBothConfigProviderAndSettings(t *testing.T) {
+	configProvider, err := NewConfigProvider(newDefaultConfigProviderSettings([]string{"otelcol-nop.yaml"}))
+	require.NoError(t, err)
+	_, err = NewCollector(CollectorSettings{
+		BuildInfo:              component.NewDefaultBuildInfo(),
+		Factories:              nopFactories,
+		ConfigProvider:         configProvider,
+		ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-invalid.yaml")}),
+	})
+	require.Error(t, err)
+}
+
 func TestNewCollectorInvalidConfigProviderSettings(t *testing.T) {
 	_, err := NewCollector(CollectorSettings{
 		BuildInfo:              component.NewDefaultBuildInfo(),