Make service events more consistent

[plorenz]

Currently service fails are only tracked if the attempt hasn't timed out, but events for specific error causes, like connection refused, are always tracked.

Unfortunately we don't have the full data to properly track things once the attempt has timed out. We know the router (since the router has sent the failure response), but any current attempt may have a different terminator.