[DoH] Extend Net.DNS.UpgradeConfig metrics

These metrics can be useful in assessing trends in whether systems are
eligible for the DoH auto-upgrade functionality.

Fixed: 337862375
Change-Id: I9d645082c56978dd35235ae1415e1027ecc8261c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5526979
Reviewed-by: Tsuyoshi Horo <horo@chromium.org>
Reviewed-by: Nidhi Jaju <nidhijaju@chromium.org>
Commit-Queue: Andrew Williams <awillia@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1298480}
diff --git a/tools/metrics/histograms/metadata/net/histograms.xml b/tools/metrics/histograms/metadata/net/histograms.xml
index f4c75ae..8e6aece 100644
--- a/tools/metrics/histograms/metadata/net/histograms.xml
+++ b/tools/metrics/histograms/metadata/net/histograms.xml
@@ -1547,8 +1547,8 @@
 </histogram>
 
 <histogram name="Net.DNS.UpgradeConfig.DotUpgradeSucceeded" enum="Boolean"
-    expires_after="2024-10-13">
-  <owner>horo@chromium.org</owner>
+    expires_after="2025-05-08">
+  <owner>awillia@chromium.org</owner>
   <owner>src/net/dns/OWNERS</owner>
   <summary>
     True if upgrade to DoH from a DoT hostname was attempted and succeeded.
@@ -1557,8 +1557,8 @@
 </histogram>
 
 <histogram name="Net.DNS.UpgradeConfig.HasPublicInsecureNameserver"
-    enum="Boolean" expires_after="2024-06-12">
-  <owner>horo@chromium.org</owner>
+    enum="Boolean" expires_after="2025-05-08">
+  <owner>awillia@chromium.org</owner>
   <owner>src/net/dns/OWNERS</owner>
   <summary>
     True if there was at least one public nameserver during an attempt to
@@ -1571,8 +1571,8 @@
 </histogram>
 
 <histogram name="Net.DNS.UpgradeConfig.Ineligible.DohSpecified" enum="Boolean"
-    expires_after="2024-10-13">
-  <owner>horo@chromium.org</owner>
+    expires_after="2025-05-08">
+  <owner>awillia@chromium.org</owner>
   <owner>src/net/dns/OWNERS</owner>
   <summary>
     True if upgrade to DoH was not attempted because the DoH config was already
@@ -1581,8 +1581,8 @@
 </histogram>
 
 <histogram name="Net.DNS.UpgradeConfig.Ineligible.UnhandledOptions"
-    enum="Boolean" expires_after="2024-06-12">
-  <owner>horo@chromium.org</owner>
+    enum="Boolean" expires_after="2025-05-08">
+  <owner>awillia@chromium.org</owner>
   <owner>src/net/dns/OWNERS</owner>
   <summary>
     True if upgrade to DoH was not attempted because of unhandled options in the
@@ -1592,8 +1592,8 @@
 </histogram>
 
 <histogram name="Net.DNS.UpgradeConfig.InsecureUpgradeSucceeded" enum="Boolean"
-    expires_after="2024-10-13">
-  <owner>horo@chromium.org</owner>
+    expires_after="2025-05-08">
+  <owner>awillia@chromium.org</owner>
   <owner>src/net/dns/OWNERS</owner>
   <summary>
     True if upgrade to DoH from insecure DNS was attempted and succeeded. False