2.x Add client metrics.