support logr.KeysAndValues

This special type gets logged like an object, with attributes
defined by the keys and values.

Author: pohly

zapr.go

@@ -174,6 +174,14 @@ func zapIt(field string, val interface{}) zap.Field {
 	if marshaler, ok := val.(logr.Marshaler); ok {
 		field, val = invokeMarshaler(field, marshaler)
 	}
+	if keysAndValues, ok := val.(logr.KeysAndValues); ok {
+		return zap.Object(field, zapcore.ObjectMarshalerFunc(func(encoder zapcore.ObjectEncoder) error {
+			for _, keyAndValue := range keysAndValues {
+				encoder.AddReflected(keyAndValue.Key, keyAndValue.Value)
+			}
+			return nil
+		}))
+	}
 	return zap.Any(field, val)
 }