[otelcol] Fix missing defaults in unredacted print-config

.chloggen/fix-unredacted-defaults.yaml

@@ -0,0 +1,7 @@
+change_type: bug_fix
+component: pkg/otelcol
+note: Fix missing default values in unredacted print-config command by introducing confmap.WithUnredacted MarshalOption.
+subtext: |
+  Resolves an issue where the unredacted mode output omitted all default-valued options. By introducing a new MarshalOption to disable redaction directly at the confmap encoding level, the unredacted mode now preserves all component defaults natively without requiring post-processing.
+issues: [14750]
+change_logs: [user]

confmap/internal/encoder.go

@@ -14,13 +14,22 @@ import (
 // EncoderConfig returns a default encoder.EncoderConfig that includes
 // an EncodeHook that handles both TextMarshaler and Marshaler
 // interfaces.
-func EncoderConfig(rawVal any, _ MarshalOptions) *encoder.EncoderConfig {
+func EncoderConfig(rawVal any, opts MarshalOptions) *encoder.EncoderConfig {
+	hooks := []mapstructure.DecodeHookFunc{
+		encoder.YamlMarshalerHookFunc(),
+	}
+
+	if opts.OpaqueUnredacted {
+		hooks = append(hooks, encoder.StringTextUnredactedHookFunc())
+	}
+
+	hooks = append(hooks,
+		encoder.TextMarshalerHookFunc(),
+		marshalerHookFunc(rawVal),
+	)
+
 	return &encoder.EncoderConfig{
-		EncodeHook: mapstructure.ComposeDecodeHookFunc(
-			encoder.YamlMarshalerHookFunc(),
-			encoder.TextMarshalerHookFunc(),
-			marshalerHookFunc(rawVal),
-		),
+		EncodeHook: mapstructure.ComposeDecodeHookFunc(hooks...),
 	}
 }
 

confmap/internal/mapstructure/encoder.go

@@ -268,3 +268,14 @@ func YamlMarshalerHookFunc() mapstructure.DecodeHookFuncValue {
 		return from.Interface(), nil
 	}
 }
+
+func StringTextUnredactedHookFunc() mapstructure.DecodeHookFuncValue {
+	return func(from, _ reflect.Value) (any, error) {
+		if from.Kind() == reflect.String {
+			if _, ok := from.Interface().(encoding.TextMarshaler); ok {
+				return from.String(), nil
+			}
+		}
+		return from.Interface(), nil
+	}
+}

confmap/internal/marshaloption.go

@@ -9,7 +9,9 @@ type MarshalOption interface {
 
 // MarshalOptions is used by (*Conf).Marshal to toggle unmarshaling settings.
 // It is in the `internal` package so experimental options can be added in xconfmap.
-type MarshalOptions struct{}
+type MarshalOptions struct {
+	OpaqueUnredacted bool
+}
 
 type MarshalOptionFunc func(*MarshalOptions)
 

confmap/xconfmap/confmap.go

@@ -25,3 +25,9 @@
 func ToStringMapRaw(conf *confmap.Conf) map[string]any {
 	return internal.ToStringMapRaw(conf)
 }
+
+func WithUnredacted() confmap.MarshalOption {
+	return internal.MarshalOptionFunc(func(opts *internal.MarshalOptions) {
+		opts.OpaqueUnredacted = true
+	})
+}

otelcol/command_print.go

@@ -144,32 +144,27 @@ func (pctx *printContext) getPrintableConfig() (any, error) {
 // with the intended types for each component, thus it shows the full
 // configuration without considering configuopaque. Use with caution.
 func (pctx *printContext) printUnredactedConfig() error {
+	cfg, err := pctx.getPrintableConfig()
+	if err != nil {
+		return err
+	}
+
 	if pctx.validate {
 		// Validation serves prevent revealing invalid data.
-		cfg, err := pctx.getPrintableConfig()
-		if err != nil {
-			return err
-		}
 		if err = xconfmap.Validate(cfg); err != nil {
 			return fmt.Errorf("invalid configuration: %w", err)
 		}
-
 		// Note: we discard the validated configuration.
 	}
-	resolver, err := confmap.NewResolver(pctx.set.ConfigProviderSettings.ResolverSettings)
-	if err != nil {
-		return fmt.Errorf("failed to create new resolver: %w", err)
-	}
-	conf, err := resolver.Resolve(pctx.cmd.Context())
-	if err != nil {
-		return fmt.Errorf("error while resolving config: %w", err)
+
+	confMap := confmap.New()
+	if err := confMap.Marshal(cfg, xconfmap.WithUnredacted()); err != nil {
+		return fmt.Errorf("failed to marshal config: %w", err)
 	}
-	return pctx.printConfigData(conf.ToStringMap())
+
+	return pctx.printConfigData(confMap.ToStringMap())
 }
 
-// printRedactedConfig prints resolved configuration with its assigned
-// types, but without validation. Notably, configopaque strings are printed
-// as "[redacted]". This is the default.
 func (pctx *printContext) printRedactedConfig() error {
 	cfg, err := pctx.getPrintableConfig()
 	if err != nil {
@@ -186,5 +181,6 @@ func (pctx *printContext) printRedactedConfig() error {
 	if err := confMap.Marshal(cfg); err != nil {
 		return fmt.Errorf("failed to marshal config: %w", err)
 	}
+
 	return pctx.printConfigData(confMap.ToStringMap())
 }

otelcol/command_print_test.go

@@ -75,7 +75,7 @@ func TestPrintCommand(t *testing.T) {
 			name:            "invalid syntax without validate",
 			path:            invalidConfig1,
 			errString:       "'timeout' time: invalid duration",
-			errOnlyRedacted: true,
+			errOnlyRedacted: false,
 		},
 		{
 			name:      "validation fail",
@@ -101,23 +101,17 @@ func TestPrintCommand(t *testing.T) {
 			name: "default field value",
 			path: defaultConfig,
 			outString: map[string]string{
-				"redacted": `timeout: 1s`,
-
-				// Since the structure is empty before
-				// interpretation, no default is expanded.
-				"unredacted": `e: null`,
+				"redacted":   `timeout: 1s`,
+				"unredacted": `timeout: 1s`,
 			},
 		},
 		{
 			name: "field is set json",
 			ofmt: "json",
 			path: validConfig,
 			outString: map[string]string{
-				// Note: JSON does not format as a time.Duration
-				"redacted": `"timeout": 5000000000`,
-
-				// Note: the original input is "5s"
-				"unredacted": `"timeout": "5s"`,
+				"redacted":   `"timeout": 5000000000`,
+				"unredacted": `"timeout": 5000000000`,
 			},
 		},
 		{
@@ -132,12 +126,8 @@ func TestPrintCommand(t *testing.T) {
 			name: "opaque default",
 			path: defaultConfig,
 			outString: map[string]string{
-				"redacted": `opaque: '[REDACTED]'`,
-
-				// Note: the default opaque value does not print,
-				// the other value is set in defaultConfig so that
-				// the whole component config is not defaulted.
-				"unredacted": `other: lala`,
+				"redacted":   `opaque: '[REDACTED]'`,
+				"unredacted": `opaque: "1234"`,
 			},
 		},
 	}