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 683343c98badc31bd34e1c4098b64d1f8f65b153..db2f0bf93bbfebbd9988e5f6b16b62b29624411e 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -27577,6 +27577,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="Net.QuicSession.21CumulativePacketsReceived"
     units="Received in Ranges">
+  <obsolete>
+    Deprecated as of 04/2016.
+  </obsolete>
   <owner>rch@chromium.org</owner>
   <summary>
     This histogram summarizes information about a 21 packet sequence, indicating
@@ -27596,6 +27599,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="Net.QuicSession.6PacketsPatternsReceived"
     units="Binay of Packets ACKed">
+  <obsolete>
+    Deprecated as of 04/2016.
+  </obsolete>
   <owner>rch@chromium.org</owner>
   <summary>
     Each of the 64 buckets represents a different binary pattern of 6
@@ -89303,6 +89309,9 @@ To add a new entry, add it with any value and run test to compute valid value.
 </histogram_suffixes>
 
 <histogram_suffixes name="Net.QuicSession.21CumulativePackets" separator="_">
+  <obsolete>
+    Deprecated as of 04/2016.
+  </obsolete>
   <owner>rch@chromium.org</owner>
   <suffix name="First21"
       label="Only the first group of 21 packets in a connection via"/>
@@ -89313,6 +89322,9 @@ To add a new entry, add it with any value and run test to compute valid value.
 </histogram_suffixes>
 
 <histogram_suffixes name="Net.QuicSession.6PacketPatterns" separator="_">
+  <obsolete>
+    Deprecated as of 04/2016.
+  </obsolete>
   <owner>rch@chromium.org</owner>
   <suffix name="First6"
       label="Only the first group of 6 packets in a connection via"/>
@@ -89364,12 +89376,6 @@ To add a new entry, add it with any value and run test to compute valid value.
   <suffix name="CONNECTION_BLUETOOTH"
       label="Bluetooth are tallied, but this may include connections to a
              mobile hotspot."/>
-  <affected-histogram
-      name="Net.QuicSession.21CumulativePacketsReceived_First21"/>
-  <affected-histogram
-      name="Net.QuicSession.21CumulativePacketsReceived_Some21s"/>
-  <affected-histogram name="Net.QuicSession.6PacketsPatternsReceived_First6"/>
-  <affected-histogram name="Net.QuicSession.6PacketsPatternsReceived_Some6s"/>

[Alexei Svitkine (slow), 2016/04/18 20:45:08]

We still want these to be able to decode data from old versions. It's fine to
leave the affected-histograms as-is if the corresponding metrics are marked as
<obsolete>. (The suffixed versions will inherit that flag as far
dashboards/tools are concerned.)

   <affected-histogram name="Net.QuicSession.PacketLossRate"/>
   <affected-histogram name="Net.QuicSession.PacketReceived_Ack"/>
   <affected-histogram name="Net.QuicSession.PacketReceived_IsAnAck"/>