Revert 6155cc25ddaad253abcced4fcd8108d1be98e9c1

component/config.go

@@ -32,7 +32,7 @@
 		return cu.Unmarshal(conf)
 	}
 
-	return conf.Unmarshal(intoCfg)
+	return conf.Unmarshal(intoCfg, confmap.WithErrorUnused())
 }
 
 // ConfigValidator defines an optional interface for configurations to implement to do validation.

confmap/confmap.go

@@ -51,25 +51,15 @@ type UnmarshalOption interface {
 }
 
 type unmarshalOption struct {
-	ignoreUnused bool
+	errorUnused bool
 }
 
 // WithErrorUnused sets an option to error when there are existing
 // keys in the original Conf that were unused in the decoding process
-// (extra keys). This option is enabled by default and can be disabled with `WithIgnoreUnused`.
-// Deprecated: [v0.92.0] this is now enabled by default. Use `WithIgnoreUnused` to disable.
-func WithErrorUnused() UnmarshalOption {
-	return unmarshalOptionFunc(func(uo *unmarshalOption) {
-		uo.ignoreUnused = false
-	})
-}
-
-// WithIgnoreUnused sets an option to ignore errors if existing
-// keys in the original Conf were unused in the decoding process
 // (extra keys).
-func WithIgnoreUnused() UnmarshalOption {
+func WithErrorUnused() UnmarshalOption {
 	return unmarshalOptionFunc(func(uo *unmarshalOption) {
-		uo.ignoreUnused = true
+		uo.errorUnused = true
 	})
 }
 
@@ -86,7 +76,7 @@ func (l *Conf) Unmarshal(result any, opts ...UnmarshalOption) error {
 	for _, opt := range opts {
 		opt.apply(&set)
 	}
-	return decodeConfig(l, result, !set.ignoreUnused)
+	return decodeConfig(l, result, set.errorUnused)
 }
 
 type marshalOption struct{}

confmap/confmap_test.go

@@ -149,8 +149,7 @@ func TestUnmarshalWithErrorUnused(t *testing.T) {
 		"string":  "this is a string",
 	}
 	conf := NewFromStringMap(stringMap)
-	assert.Error(t, conf.Unmarshal(&TestIDConfig{}))
-	assert.NoError(t, conf.Unmarshal(&TestIDConfig{}, WithIgnoreUnused()))
+	assert.Error(t, conf.Unmarshal(&TestIDConfig{}, WithErrorUnused()))
 }
 
 type TestConfig struct {

exporter/loggingexporter/config.go

@@ -65,7 +65,7 @@ func (cfg *Config) Unmarshal(conf *confmap.Conf) error {
 		return fmt.Errorf("'loglevel' and 'verbosity' are incompatible. Use only 'verbosity' instead")
 	}
 
-	if err := conf.Unmarshal(cfg); err != nil {
+	if err := conf.Unmarshal(cfg, confmap.WithErrorUnused()); err != nil {
 		return err
 	}
 

otelcol/internal/configunmarshaler/configs.go

@@ -23,7 +23,7 @@ func NewConfigs[F component.Factory](factories map[component.Type]F) *Configs[F]
 
 func (c *Configs[F]) Unmarshal(conf *confmap.Conf) error {
 	rawCfgs := make(map[component.ID]map[string]any)
-	if err := conf.Unmarshal(&rawCfgs); err != nil {
+	if err := conf.Unmarshal(&rawCfgs, confmap.WithErrorUnused()); err != nil {
 		return err
 	}
 

otelcol/unmarshaler.go

@@ -66,5 +66,5 @@ func unmarshal(v *confmap.Conf, factories Factories) (*configSettings, error) {
 		},
 	}
 
-	return cfg, v.Unmarshal(&cfg)
+	return cfg, v.Unmarshal(&cfg, confmap.WithErrorUnused())
 }

otelcol/unmarshaler_test.go

@@ -135,7 +135,7 @@ func TestPipelineConfigUnmarshalError(t *testing.T) {
 	for _, tt := range testCases {
 		t.Run(tt.name, func(t *testing.T) {
 			pips := new(pipelines.Config)
-			err := tt.conf.Unmarshal(&pips)
+			err := tt.conf.Unmarshal(&pips, confmap.WithErrorUnused())
 			require.Error(t, err)
 			assert.Contains(t, err.Error(), tt.expectError)
 		})
@@ -203,7 +203,7 @@ func TestServiceUnmarshalError(t *testing.T) {
 
 	for _, tt := range testCases {
 		t.Run(tt.name, func(t *testing.T) {
-			err := tt.conf.Unmarshal(&service.Config{})
+			err := tt.conf.Unmarshal(&service.Config{}, confmap.WithErrorUnused())
 			require.Error(t, err)
 			assert.Contains(t, err.Error(), tt.expectError)
 		})

receiver/otlpreceiver/config.go

@@ -60,7 +60,7 @@ func (cfg *Config) Validate() error {
 // Unmarshal a confmap.Conf into the config struct.
 func (cfg *Config) Unmarshal(conf *confmap.Conf) error {
 	// first load the config normally
-	err := conf.Unmarshal(cfg)
+	err := conf.Unmarshal(cfg, confmap.WithErrorUnused())
 	if err != nil {
 		return err
 	}