moved all metrics to use the module, deleting old metrics file and added different check in err domain