B-60117 Moving Metrics To A Service

Splitting my original pull request #802