Merge pull request #259 from qiangdavidliu/2.x

Adding metrics for bridge server