Merge pull request #387 from iamqizhao/master

Refactor server side tracing