Add calls to highwater for metrics

@jh-bate Take a look, please? I don't think there's anything controversial, but if you want to log more stuff, we should talk about it.