Moves metrics logging to top of handlers