Merge pull request #382 from iamqizhao/master

Refactor server side tracing