updated metrics collecection similar to cluster3 branch