Sanitize better and actually include the endpoint in the statsd update