Merge "Reorganize MetricProducer.h"