Fix metrics reporter retry logic (#700)

Fix metrics reporter retry logic (#700) #77