Add timing metric and beforeMetric callback (part 3) (#1954)

Add timing metric and beforeMetric callback (part 3) (#1954) #1968