Change how stats are computed

presently, we compute stats only on messages which have been actually handled

also, messages that have been retried are corrupting the metric "waiting time in queue", because they are not "requeued" but they are handled synchronously