This PR polishes observability changes a bit.

Comment From: bclozel

Thanks for having a look @izeye , this really helps the team before our RC1!