Add hook to confmap.Conf.Marshal

open-telemetry · Jun 6, 2024 · 6e24246 · 6e24246
1 parent b72dd77
commit 6e24246
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/confmap/confmap.go b/confmap/confmap.go
@@ -191,6 +191,7 @@ func decodeConfig(m *Conf, result any, errorUnused bool, skipTopLevelUnmarshaler
 func encoderConfig(rawVal any) *encoder.EncoderConfig {
 	return &encoder.EncoderConfig{
 		EncodeHook: mapstructure.ComposeDecodeHookFunc(
+			encoder.YamlMarshalerHookFunc(),
 			encoder.TextMarshalerHookFunc(),
 			marshalerHookFunc(rawVal),
 		),

diff --git a/confmap/internal/mapstructure/encoder_test.go b/confmap/internal/mapstructure/encoder_test.go
@@ -12,6 +12,8 @@ import (
 
 	"github.com/go-viper/mapstructure/v2"
 	"github.com/stretchr/testify/require"
+
+
 )
 
 type TestComplexStruct struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,8 @@ import ( @@
     	"github.com/go-viper/mapstructure/v2"
     	"github.com/stretchr/testify/require"
     )
     type TestComplexStruct struct {
@@ Expand Down @@