CDAP-735: Spark metrics redesign