getMetrics() uses FIELDS.
Removed code duplication from getMetrics().
'key' is 'metric'.
Merge pull request #1 from tristanls/simplify

Simplify logic within getMetrics()