Refactor to use github.com/dgryski/httputil for tracking