Merge "Add counter metrics for tracking failures"