Add detailed UMA metrics for v4_store, broken down by storeid.

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 06d5f2f5add148c2fd2a891efcb7516ba4c9c778..8c5dfb533b903a5399b0773c20aa3affb393d22a 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -51181,7 +51181,19 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.V4AddUnlumpedHashes.Time" units="ms">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Records the time it takes to copy the SafeBrowsing list update as a string,
+    into a map which contains the hash prefixes that are looked up when a client
+    queries for the reputation of a resource (URL, full hash, etc.).
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.V4AddUnlumpedHashesTime" units="ms">
+  <obsolete>
+    Replaced by SafeBrowsing.V4AddUnlumpedHashes.Time.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Records the time it takes to copy the SafeBrowsing list update as a string,
@@ -51193,6 +51205,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 <histogram name="SafeBrowsing.V4ApplyUpdateResult"
     enum="SafeBrowsingV4ApplyUpdateResult">
   <owner>vakh@chromium.org</owner>
+  <obsolete>
+    Replaced by SafeBrowsing.V4*.ApplyUpdate.Result.
+  </obsolete>
   <summary>
     Track the result of applying the update fetched from the PVer4 service for a
     particular store.
@@ -51201,6 +51216,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="SafeBrowsing.V4ApplyUpdateResultWhenReadingFromDisk"
     enum="SafeBrowsingV4ApplyUpdateResult">
+  <obsolete>
+    Replaced by SafeBrowsing.V4ReadFromDisk.ApplyUpdate.Result.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Track the result of applying an update read from disk after parsing it
@@ -51210,6 +51228,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="SafeBrowsing.V4DecodeAdditionsResult"
     enum="SafeBrowsingV4DecodeResult">
+  <obsolete>
+    Replaced by SafeBrowsing.V4*.DecodeAdditions.Result.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Track the result of decoding the Rice-encoded list of additions of 4-byte
@@ -51219,6 +51240,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="SafeBrowsing.V4DecodeAdditionsTime" units="ms">
+  <obsolete>
+    Replaced by SafeBrowsing.V4*.DecodeAdditions.Time.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Records the time it takes to decode the Rice-encoded additions to the
@@ -51228,6 +51252,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="SafeBrowsing.V4DecodeRemovalsResult"
     enum="SafeBrowsingV4DecodeResult">
+  <obsolete>
+    Replaced by SafeBrowsing.V4ProcessPartialUpdate.DecodeRemovals.Result.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Track the result of decoding the Rice-encoded list of indexes of hash
@@ -51237,6 +51264,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="SafeBrowsing.V4DecodeRemovalsTime" units="ms">
+  <obsolete>
+    Replaced by SafeBrowsing.V4ProcessPartialUpdate.DecodeRemovals.Time.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Records the time it takes to decode the Rice-encoded removals from the
@@ -51259,6 +51289,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="SafeBrowsing.V4MergeUpdateTime" units="ms">
+  <obsolete>
+    Replaced by SafeBrowsing.V4*.MergeUpdate.Time.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Records the time it takes to merge the existing state of the list with the
@@ -51267,7 +51300,58 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.V4ProcessFullUpdate.ApplyUpdate.Result"
+    enum="SafeBrowsingV4ApplyUpdateResult">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Track the result of applying a full update for a store received from PVer4
+    SafeBrowsing service.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ProcessFullUpdate.ApplyUpdate.Time" units="ms">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Records the time it takes to process a SafeBrowsing list full update. It
+    includes V4AddUnlumpedHashes.Time for each prefix-sized list, and
+    V4ProcessFullUpdate.MergeUpdate.Time. Additionally, if the update is
+    Rice-encoded, it includes V4ProcessFullUpdate.DecodeAdditions.Time for each
+    prefix-sized list that's Rice-encoded.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ProcessFullUpdate.DecodeAdditions.Result"
+    enum="SafeBrowsingV4DecodeResult">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Track the result of decoding the Rice-encoded list of additions of 4-byte
+    hash prefixes. This is logged once per store, per update containing
+    Rice-encoded additions. This histogram is specific to processing full
+    updates received from the server.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ProcessFullUpdate.DecodeAdditions.Time"
+    units="ms">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Records the time it takes to decode the Rice-encoded additions to the
+    blacklist into raw format when applying a full update to a store.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ProcessFullUpdate.MergeUpdate.Time" units="ms">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Records the time it takes to merge the existing state of the list with a
+    full update received from the server.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.V4ProcessFullUpdateTime" units="ms">
+  <obsolete>
+    Replaced by SafeBrowsing.V4ProcessFullUpdate.ApplyUpdate.Time.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Records the time it takes to process a SafeBrowsing list full update. It
@@ -51277,7 +51361,81 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.V4ProcessPartialUpdate.ApplyUpdate.Result"
+    enum="SafeBrowsingV4ApplyUpdateResult">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Track the result of applying a partial update for a store received from
+    PVer4 SafeBrowsing service.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ProcessPartialUpdate.ApplyUpdate.Time"
+    units="ms">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Records the time it takes to process a SafeBrowsing list partial update. It
+    includes V4AddUnlumpedHashes.Time for each prefix-sized list, and
+    SafeBrowsing.V4ProcessPartialUpdate.MergeUpdate.Time. Additionally, if the
+    update is Rice-encoded, it includes
+    V4ProcessPartialUpdate.DecodeRemovals.Time, and
+    V4ProcessPartialUpdate.DecodeAdditions.Time for each prefix-sized list
+    that's Rice-encoded.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ProcessPartialUpdate.DecodeAdditions.Result"
+    enum="SafeBrowsingV4DecodeResult">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Track the result of decoding the Rice-encoded list of additions of 4-byte
+    hash prefixes. This is logged once per store, per update containing
+    Rice-encoded additions. This histogram is specific to processing partial
+    updates received from the server.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ProcessPartialUpdate.DecodeAdditions.Time"
+    units="ms">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Records the time it takes to decode the Rice-encoded additions to the
+    blacklist into raw format when applying a partial update to a store.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ProcessPartialUpdate.DecodeRemovals.Result"
+    enum="SafeBrowsingV4DecodeResult">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Track the result of decoding the Rice-encoded list of indexes of hash
+    prefixes to remove since the last update. This is logged once per store, per
+    update containing Rice-encoded removals.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ProcessPartialUpdate.DecodeRemovals.Time"
+    units="ms">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Records the time it takes to decode the Rice-encoded removals from the
+    blacklist into raw format when applying a partial update to a store.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ProcessPartialUpdate.MergeUpdate.Time"
+    units="ms">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Records the time it takes to merge the existing state of the list with a
+    partial update received from the server.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.V4ProcessPartialUpdateTime" units="ms">
+  <obsolete>
+    Replaced by SafeBrowsing.V4ProcessPartialUpdate.ApplyUpdate.Time.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Records the time it takes to process a SafeBrowsing list partial update. It
@@ -51288,7 +51446,57 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.V4ReadFromDisk.ApplyUpdate.Result"
+    enum="SafeBrowsingV4ApplyUpdateResult">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Track the result of applying an ListUpdateResponse read from disk after
+    parsing it successfully as a protobuf.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ReadFromDisk.ApplyUpdate.Time" units="ms">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Records the time it takes to read, parse, and process a SafeBrowsing list
+    stored on disk. This happens at Chromium start-up. It includes
+    V4AddUnlumpedHashes.Time for each prefix-sized list, and
+    SafeBrowsing.V4ReadFromDisk.MergeUpdate.Time. Additionally, if the file is
+    Rice-encoded, it includes V4ReadFromDisk.DecodeAdditions.Time for each
+    prefix-sized list that's Rice-encoded.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ReadFromDisk.DecodeAdditions.Result"
+    enum="SafeBrowsingV4DecodeResult">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Track the result of decoding the Rice-encoded list of additions of 4-byte
+    hash prefixes. This is logged once per store, per Chrome launch. It is
+    specific to processing V4StoreFileFormat proto read from disk.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ReadFromDisk.DecodeAdditions.Time" units="ms">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Records the time it takes to decode the Rice-encoded additions to the
+    blacklist into raw format when reading a store file from disk.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.V4ReadFromDisk.MergeUpdate.Time" units="ms">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Records the time it takes to perform in-memory copy of the map of raw hash
+    prefixes read from disk.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.V4ReadFromDiskTime" units="ms">
+  <obsolete>
+    Replaced by SafeBrowsing.V4ReadFromDisk.ApplyUpdate.Time.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Records the time it takes to read, parse, and process a SafeBrowsing list
@@ -51299,8 +51507,20 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.V4StoreRead.Result"

[Nathan Parker, 2016/10/14 20:48:33]

I think all the .Result and .Time metrics need to be expanded by the list of
store names, ya? We should add a comment to the list of store names in the .cc
to remember to update the histograms.

You should be able to accomplish this with  <histogram_suffixes .. separator="."
ordering="prefix"> (I think...)

[vakh (use Gerrit instead), 2016/10/15 00:09:04]

When using ordering="prefix", it adds the specified suffix after the first
period character in the histogram name so that wouldn't have worked for us. See:
https://cs.chromium.org/chromium/src/tools/metrics/actions/action_utils.py?q=...

I've added the histograms manually. See:
https://codereview.chromium.org/2423523003

+    enum="SafeBrowsingV4StoreReadResult">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Track the parsing results of reading the SafeBrowsing V4 store file from
+    disk. Recorded every time a store is read from disk.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.V4StoreReadResult"
     enum="SafeBrowsingV4StoreReadResult">
+  <obsolete>
+    Replaced by SafeBrowsing.V4StoreRead.Result.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Track the parsing results of reading the SafeBrowsing V4 store file from
@@ -51316,8 +51536,20 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.V4StoreWrite.Result"
+    enum="SafeBrowsingV4StoreWriteResult">
+  <owner>vakh@chromium.org</owner>
+  <summary>
+    Track the results of writing the SafeBrowsing V4 store file to disk.
+    Recorded every time a store is written to disk.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.V4StoreWriteResult"
     enum="SafeBrowsingV4StoreWriteResult">
+  <obsolete>
+    Replaced by SafeBrowsing.V4StoreWrite.Result.
+  </obsolete>
   <owner>vakh@chromium.org</owner>
   <summary>
     Track the results of writing the SafeBrowsing V4 store file to disk.