Added a max retry count metric, removed the global retry count one