[Analytics] Better way to identify client IP address