refactor metrics to all more flexable usage

Signed-off-by: Matthew McNew <mmcnew@pivotallabs.com>