diff --git a/http_client/__init__.py b/http_client/__init__.py
index a547756..6b64162 100644
--- a/http_client/__init__.py
+++ b/http_client/__init__.py
@@ -104,7 +104,7 @@ def build(self) -> HTTPRequest:
         request.idempotent = self.idempotent
         request.speculative_timeout_pct = self.speculative_timeout_pct
 
-        request.upstream_name = None
+        request.upstream_name = self.host
         request.upstream_datacenter = None
 
         if options.http_proxy_host is not None:
diff --git a/http_client/balancing.py b/http_client/balancing.py
index 8955285..0dfbf93 100644
--- a/http_client/balancing.py
+++ b/http_client/balancing.py
@@ -502,7 +502,7 @@ def _send_response_metrics(self, response, tries_used, do_retry):
                 dc=request.upstream_datacenter,
                 upstream=request.upstream_name
             )
-            if tries_used > 1:
+            if not do_retry and tries_used > 1:
                 self.statsd_client.count(
                     'http.client.retries', 1,
                     upstream=request.upstream_name,
@@ -543,7 +543,6 @@ def __init__(self, request: HTTPRequest, execute_request, modify_http_request_ho
                          statsd_client, kafka_producer)
 
     def _get_result_or_context(self, request: HTTPRequest):
-        request.upstream_name = request.host
         request.upstream_datacenter = self.DC_FOR_EXTERNAL_REQUESTS
         return ImmediateResultOrPreparedRequest(processed_request=request)
 
@@ -582,8 +581,6 @@ def _get_result_or_context(self, request: HTTPRequest):
 
         request.host = self.state.current_host
         request.url = self.state.current_host + self.request.uri
-
-        request.upstream_name = upstream_name
         request.upstream_datacenter = self.state.current_datacenter
 
         return ImmediateResultOrPreparedRequest(processed_request=request)