Remove MetricRegistry.
Change the metric query service to take a metric name instead of a metric ID.