Enable Nil Decoding

Signed-off-by: Mahad Zaryab <[email protected]>
open-telemetry · Nov 23, 2024 · 75840e6 · 75840e6
1 parent f74890a
commit 75840e6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/confmap/confmap.go b/confmap/confmap.go
@@ -221,6 +221,7 @@ func decodeConfig(m *Conf, result any, errorUnused bool, skipTopLevelUnmarshaler
 			unmarshalerEmbeddedStructsHookFunc(),
 			zeroSliceHookFunc(),
 		),
+		DecodeNil: true,
 	}
 	decoder, err := mapstructure.NewDecoder(dc)
 	if err != nil {
@@ -537,7 +538,9 @@ type Marshaler interface {
 func zeroSliceHookFunc() mapstructure.DecodeHookFuncValue {
 	return func(from reflect.Value, to reflect.Value) (interface{}, error) {
 		if to.CanSet() && to.Kind() == reflect.Slice && from.Kind() == reflect.Slice {
-			to.Set(reflect.MakeSlice(to.Type(), from.Len(), from.Cap()))
+			if !from.IsNil() {
+				to.Set(reflect.MakeSlice(to.Type(), from.Len(), from.Cap()))
+			}
 		}
 
 		return from.Interface(), nil