OOPS reports should take into account Retries

OOPS reports should take into account whether the request has been retried by showing how many retries occurred, and preferably showing independently the SQL and non-SQL time for each retry. This will allow us to see whether retried requests are using a lot of database resources, particularly with transactions involving writes to the database, it will help us debug cases where state that should be reset on a Retry is not reset, and will give us insight into whether some OOPS reports that have a lot of non-sql time are requests that were retried. That is, if we're resetting the SQL statement log on a Retry, but not resetting the non-sql-time counter.