Please create a pull request against master.
Try to make the code in the pull request as focused and clean as possible. See our style guide. If the pull request is too large, we may ask you to split it into smaller ones.
By contributing your code, you agree to license your contribution under the terms of the Apache Public License v2: https://github.com/twitter/zipkin/blob/master/LICENSE