Improve logging for metrics (OMS-187)