[stacked 1/5] metrics: cleanup metrics registration, collection and gathering.

[stacked 1/5] metrics: cleanup metrics registration, collection and gathering. #1603