Added metrics
Merge branch 'master' into datadog_metrics