Track network stack error codes from UMA and UKM

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 0a7235dd97d4838a73d7f3a210be62cece41a37e..9554abf29696a5b5836d715f256b1c570ff7cfbe 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -73944,6 +73944,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UKM.LogUpload.ResponseOrErrorCode"
+    enum="CombinedHttpResponseAndNetErrorCode">
+  <owner>holte@chromium.org</owner>
+  <owner>rkaplow@chromium.org</owner>
+  <summary>
+    HTTP response codes and network errors encountered by UKM when attempting to
+    upload logs to the server.
+  </summary>
+</histogram>
+
 <histogram name="UKM.PersistentLogRecall.Status"
     enum="PersistedLogsLogReadStatus">
   <owner>holte@chromium.org</owner>
@@ -73984,6 +73994,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="UKM.Upload.ResponseCode" enum="HttpResponseCode">
+  <obsolete>
+    Replaced by UKM.LogUpload.ResponseOrErrorCode
+  </obsolete>
   <owner>holte@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <summary>
@@ -74481,6 +74494,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UMA.LogUpload.ResponseOrErrorCode"
+    enum="CombinedHttpResponseAndNetErrorCode">
+  <owner>holte@chromium.org</owner>
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    HTTP response codes and network errors encountered by UMA when attempting to
+    upload logs to the server.
+  </summary>
+</histogram>
+
 <histogram name="UMA.LowEntropySourceValue">
   <owner>asvitkine@chromium.org</owner>
   <summary>
@@ -74720,6 +74743,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="UMA.UploadResponseStatus.Protobuf"
     enum="UmaUploadResponseStatus">
+  <obsolete>
+    Replaced by UMA.LogUpload.ResponseOrErrorCode
+  </obsolete>
   <owner>asvitkine@chromium.org</owner>
   <summary>
     For each upload to the protocol buffer (v2) UMA server, log whether the