Add client metrics.
Merge pull request #231 from tbak/2.x

2.x Add client metrics.