[otelcol] update to use confmap unmarshal validation instead of invoking top-level Validate function manually.

.chloggen/tyler.confmap-configvalidator.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: confmap
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add ability for confmap to invoke `ConfigValidator.Validate` as part of `conf.Unmarshal`.
+
+# One or more tracking issues or pull requests related to the change
+issues: [12031]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]

confmap/confmap.go

@@ -15,7 +15,6 @@ import (
 	"github.com/knadh/koanf/maps"
 	"github.com/knadh/koanf/providers/confmap"
 	"github.com/knadh/koanf/v2"
-
 	encoder "go.opentelemetry.io/collector/confmap/internal/mapstructure"
 )
 
@@ -59,7 +58,8 @@ type UnmarshalOption interface {
 }
 
 type unmarshalOption struct {
-	ignoreUnused bool
+	ignoreUnused   bool
+	invokeValidate bool
 }
 
 // WithIgnoreUnused sets an option to ignore errors if existing
@@ -71,20 +71,125 @@ func WithIgnoreUnused() UnmarshalOption {
 	})
 }
 
+// WithInvokeValidate sets an option to invoke the Validate method
+// of unmarshalled types that implement Validator.
+// When used, config validation with be executed automatically
+// as part of unmarshalling.
+func WithInvokeValidate() UnmarshalOption {
+	return unmarshalOptionFunc(func(uo *unmarshalOption) {
+		uo.invokeValidate = true
+	})
+}
+
 type unmarshalOptionFunc func(*unmarshalOption)
 
 func (fn unmarshalOptionFunc) apply(set *unmarshalOption) {
 	fn(set)
 }
 
+// Validator defines an optional interface for configurations to implement to do validation.
+type Validator interface {
+	// Validate the configuration and returns an error if invalid.
+	Validate() error
+}
+
+// As interface types are only used for static typing, a common idiom to find the reflection Type
+// for an interface type Foo is to use a *Foo value.
+var configValidatorType = reflect.TypeOf((*Validator)(nil)).Elem()
+
+func validate(v reflect.Value) error {
+	// Validate the value itself.
+	k := v.Kind()
+	switch k {
+	case reflect.Invalid:
+		return nil
+	case reflect.Ptr, reflect.Interface:
+		return validate(v.Elem())
+	case reflect.Struct:
+		err := callValidateIfPossible(v)
+		if err != nil {
+			return err
+		}
+		// Reflect on the pointed data and check each of its fields.
+		for i := 0; i < v.NumField(); i++ {
+			if !v.Type().Field(i).IsExported() {
+				continue
+			}
+			err = validate(v.Field(i))
+			if err != nil {
+				return err
+			}
+		}
+	case reflect.Slice, reflect.Array:
+		err := callValidateIfPossible(v)
+		if err != nil {
+			return err
+		}
+		// Reflect on the pointed data and check each of its fields.
+		for i := 0; i < v.Len(); i++ {
+			err = validate(v.Index(i))
+			if err != nil {
+				return err
+			}
+		}
+	case reflect.Map:
+		err := callValidateIfPossible(v)
+		if err != nil {
+			return err
+		}
+		iter := v.MapRange()
+		for iter.Next() {
+			err = validate(iter.Key())
+			if err != nil {
+				return err
+			}
+			err = validate(iter.Value())
+			if err != nil {
+				return err
+			}
+		}
+	default:
+		return callValidateIfPossible(v)
+	}
+	return nil
+}
+
+func callValidateIfPossible(v reflect.Value) error {
+	// If the value type implements Validator just call Validate
+	if v.Type().Implements(configValidatorType) {
+		return v.Interface().(Validator).Validate()
+	}
+
+	// If the pointer type implements Validator call Validate on the pointer to the current value.
+	if reflect.PointerTo(v.Type()).Implements(configValidatorType) {
+		// If not addressable, then create a new *V pointer and set the value to current v.
+		if !v.CanAddr() {
+			pv := reflect.New(reflect.PointerTo(v.Type()).Elem())
+			pv.Elem().Set(v)
+			v = pv.Elem()
+		}
+		return v.Addr().Interface().(Validator).Validate()
+	}
+
+	return nil
+}
+
 // Unmarshal unmarshalls the config into a struct using the given options.
 // Tags on the fields of the structure must be properly set.
 func (l *Conf) Unmarshal(result any, opts ...UnmarshalOption) error {
 	set := unmarshalOption{}
 	for _, opt := range opts {
 		opt.apply(&set)
 	}
-	return decodeConfig(l, result, !set.ignoreUnused, l.skipTopLevelUnmarshaler)
+	err := decodeConfig(l, result, !set.ignoreUnused, l.skipTopLevelUnmarshaler)
+	if err != nil {
+		return err
+	}
+
+	if set.invokeValidate {
+		return validate(reflect.ValueOf(result))
+	}
+	return nil
 }
 
 type marshalOption struct{}

confmap/confmap_test.go

@@ -964,3 +964,181 @@ func TestStringyTypes(t *testing.T) {
 		assert.Equal(t, tt.isStringy, isStringyStructure(to))
 	}
 }
+
+type validateConfig struct {
+	String      string                          `mapstructure:"string"`
+	Nested      nestedValidateConfig            `mapstructure:"nested"`
+	SliceNested []nestedValidateConfig          `mapstructure:"slice"`
+	MapNested   map[string]nestedValidateConfig `mapstructure:"map"`
+}
+
+func (c *validateConfig) Validate() error {
+	if c.String == "error" {
+		return errors.New("error in validateConfig because String")
+	}
+	return nil
+}
+
+type nestedValidateConfig struct {
+	String string `mapstructure:"string"`
+}
+
+func (c *nestedValidateConfig) Validate() error {
+	if c.String == "error" {
+		return errors.New("error in nestedValidateConfig because String")
+	}
+	return nil
+}
+
+func TestUnmarshalInvokesValidate(t *testing.T) {
+	tests := []struct {
+		name  string
+		input map[string]any
+		err   error
+	}{
+		{
+			name: "Validation passes",
+			input: map[string]any{
+				"string": "value",
+				"nested": nestedValidateConfig{
+					String: "value",
+				},
+				"slice": []nestedValidateConfig{
+					{
+						String: "value",
+					},
+				},
+				"map": map[string]nestedValidateConfig{
+					"key": {
+						String: "value",
+					},
+				},
+			},
+			err: nil,
+		},
+		{
+			name: "Validation fails because String",
+			input: map[string]any{
+				"string": "error",
+			},
+			err: errors.New("error in validateConfig because String"),
+		},
+		{
+			name: "Validation fails because nested String",
+			input: map[string]any{
+				"nested": nestedValidateConfig{
+					String: "error",
+				},
+			},
+			err: errors.New("error in nestedValidateConfig because String"),
+		},
+		{
+			name: "Validation fails because nested slice String",
+			input: map[string]any{
+				"slice": []nestedValidateConfig{
+					{
+						String: "error",
+					},
+				},
+			},
+			err: errors.New("error in nestedValidateConfig because String"),
+		},
+		{
+			name: "Validation fails because nested map String",
+			input: map[string]any{
+				"map": map[string]nestedValidateConfig{
+					"key": {
+						String: "error",
+					},
+				},
+			},
+			err: errors.New("error in nestedValidateConfig because String"),
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			conf := NewFromStringMap(tt.input)
+			c := &validateConfig{}
+			err := conf.Unmarshal(c, WithInvokeValidate())
+			if tt.err == nil {
+				require.NoError(t, err)
+			} else {
+				require.Equal(t, tt.err, err)
+			}
+		})
+	}
+}
+
+type topConfig struct {
+	CustomUnmarshalConfig customUnmarshalConfig `mapstructure:"custom"`
+}
+
+type customUnmarshalConfig struct {
+	String string               `mapstructure:"string"`
+	Nested nestedValidateConfig `mapstructure:"nested"`
+}
+
+// Unmarshal a confmap.Conf into the config struct.
+func (c *customUnmarshalConfig) Unmarshal(conf *Conf) error {
+	err := conf.Unmarshal(c)
+	if err != nil {
+		return err
+	}
+	if c.String == "" {
+		c.String = "some fancy value"
+	}
+	return nil
+}
+
+func TestCustomUnmarshalInvokesValidate(t *testing.T) {
+	input := map[string]any{
+		"custom": map[string]any{
+			"nested": map[string]any{
+				"string": "error",
+			},
+		},
+	}
+	conf := NewFromStringMap(input)
+	c := &topConfig{}
+	err := conf.Unmarshal(c, WithInvokeValidate())
+	require.Equal(t, errors.New("error in nestedValidateConfig because String"), err)
+
+	input = map[string]any{
+		"custom": map[string]any{
+			"nested": map[string]any{
+				"string": "value",
+			},
+		},
+	}
+	conf = NewFromStringMap(input)
+	c = &topConfig{}
+	err = conf.Unmarshal(c, WithInvokeValidate())
+	require.NoError(t, err)
+	assert.Equal(t, "some fancy value", c.CustomUnmarshalConfig.String)
+	assert.Equal(t, "value", c.CustomUnmarshalConfig.Nested.String)
+}
+
+type manualUnmarshalConfig struct {
+	Nested nestedValidateConfig `mapstructure:"nested"`
+}
+
+// Unmarshal a confmap.Conf into the config struct.
+func (c *manualUnmarshalConfig) Unmarshal(_ *Conf) error {
+	c.Nested = nestedValidateConfig{
+		String: "error",
+	}
+	return nil
+}
+
+func TestValidateIsInvokedWhenManuallyUnmarshalling(t *testing.T) {
+	input := map[string]any{
+		"nested": map[string]any{
+			"string": "anything",
+		},
+	}
+	conf := NewFromStringMap(input)
+	c := &manualUnmarshalConfig{}
+	err := conf.Unmarshal(c, WithInvokeValidate())
+	require.Equal(t, errors.New("error in nestedValidateConfig because String"), err)
+}

otelcol/collector.go

@@ -168,10 +168,6 @@ func (col *Collector) setupConfigurationComponents(ctx context.Context) error {
 		return fmt.Errorf("failed to get config: %w", err)
 	}
 
-	if err = cfg.Validate(); err != nil {
-		return fmt.Errorf("invalid configuration: %w", err)
-	}
-
 	col.serviceConfig = &cfg.Service
 
 	conf := confmap.New()
@@ -253,12 +249,11 @@ func (col *Collector) DryRun(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("failed to initialize factories: %w", err)
 	}
-	cfg, err := col.configProvider.Get(ctx, factories)
+	_, err = col.configProvider.Get(ctx, factories)
 	if err != nil {
 		return fmt.Errorf("failed to get config: %w", err)
 	}
-
-	return cfg.Validate()
+	return nil
 }
 
 func newFallbackLogger(options []zap.Option) (*zap.Logger, error) {