The SF Giants agreed to a one-year deal to avoid arbitration with second baseman Thairo Estrada, per multiple reports.