From 8548b8f0558bf516e204cadb0269a8f178a8ab19 Mon Sep 17 00:00:00 2001
From: kundaji <kundaji@chromium.org>
Date: Tue, 18 Aug 2015 12:34:57 -0700
Subject: [PATCH] Rename
 Net.DailyContentLength_DataReductionProxyEnabled_Unknown.

Net.DailyContentLength_DataReductionProxyEnabled_Unknown is accidentally
tracking 2 separate metrics in the same histogram. It clashes with
the histogram generated by adding the "Unknown" suffix in
Net.DailyContentLength_DataReductionProxyEnabled. Moving both histograms
to a new name and deprecating the old histograms.

Review URL: https://codereview.chromium.org/1298073002

Cr-Commit-Position: refs/heads/master@{#344000}
---
 .../data_reduction_proxy_compression_stats.cc      | 17 +++++++++--------
 tools/metrics/histograms/histograms.xml            | 22 +++++++++++++++++++++-
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc
index 86f3ae15c58f..453ed6cf7448 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc
@@ -124,9 +124,9 @@ void RecordDailyContentLengthHistograms(
                          original_length >> 10);
     UMA_HISTOGRAM_COUNTS("Net.DailyContentLength_Video", received_length >> 10);
   } else if (is_mime_type_empty) {
-    UMA_HISTOGRAM_COUNTS("Net.DailyOriginalContentLength_Unknown",
+    UMA_HISTOGRAM_COUNTS("Net.DailyOriginalContentLength_UnknownMime",
                          original_length >> 10);
-    UMA_HISTOGRAM_COUNTS("Net.DailyContentLength_Unknown",
+    UMA_HISTOGRAM_COUNTS("Net.DailyContentLength_UnknownMime",
                          received_length >> 10);
   }
   int percent = 0;
@@ -164,10 +164,10 @@ void RecordDailyContentLengthHistograms(
         received_length_with_data_reduction_enabled >> 10);
   } else if (is_mime_type_empty) {
     UMA_HISTOGRAM_COUNTS(
-        "Net.DailyOriginalContentLength_DataReductionProxyEnabled_Unknown",
+        "Net.DailyOriginalContentLength_DataReductionProxyEnabled_UnknownMime",
         original_length_with_data_reduction_enabled >> 10);
     UMA_HISTOGRAM_COUNTS(
-        "Net.DailyContentLength_DataReductionProxyEnabled_Unknown",
+        "Net.DailyContentLength_DataReductionProxyEnabled_UnknownMime",
         received_length_with_data_reduction_enabled >> 10);
   }
 
@@ -216,7 +216,7 @@ void RecordDailyContentLengthHistograms(
 
   DCHECK_GE(unknown_length_with_data_reduction_enabled, 0);
   UMA_HISTOGRAM_COUNTS(
-      "Net.DailyContentLength_DataReductionProxyEnabled_Unknown",
+      "Net.DailyContentLength_DataReductionProxyEnabled_UnknownBypass",
       unknown_length_with_data_reduction_enabled >> 10);
   UMA_HISTOGRAM_PERCENTAGE(
       "Net.DailyContentPercent_DataReductionProxyEnabled_Unknown",
@@ -247,10 +247,11 @@ void RecordDailyContentLengthHistograms(
                          received_length_via_data_reduction_proxy >> 10);
   } else if (is_mime_type_empty) {
     UMA_HISTOGRAM_COUNTS(
-        "Net.DailyOriginalContentLength_ViaDataReductionProxy_Unknown",
+        "Net.DailyOriginalContentLength_ViaDataReductionProxy_UnknownMime",
         original_length_via_data_reduction_proxy >> 10);
-    UMA_HISTOGRAM_COUNTS("Net.DailyContentLength_ViaDataReductionProxy_Unknown",
-                         received_length_via_data_reduction_proxy >> 10);
+    UMA_HISTOGRAM_COUNTS(
+        "Net.DailyContentLength_ViaDataReductionProxy_UnknownMime",
+        received_length_via_data_reduction_proxy >> 10);
   }
 
   int percent_via_data_reduction_proxy = 0;
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 92c4d46a82b5..72e8ecc8a384 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -20779,6 +20779,24 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="Net.DailyContentLength_DataReductionProxyEnabled_Unknown"
     units="KB">
+  <obsolete>
+    Deprecated. Moved to
+    Net.DailyContentLength_DataReductionProxyEnabled_UnknownBypass in M46.
+  </obsolete>
+  <owner>bengr@chromium.org</owner>
+  <owner>bolian@chromium.org</owner>
+  <summary>
+    The total content size in KB of all HTTP response bodies for requests that
+    were not served by the enabled data reduction proxy for unknown reasons in
+    the previous calendar day while the data reduction proxy setting was
+    enabled. The metric is reported when the first response in the current day
+    is received.
+  </summary>
+</histogram>
+
+<histogram
+    name="Net.DailyContentLength_DataReductionProxyEnabled_UnknownBypass"
+    units="KB">
   <owner>bengr@chromium.org</owner>
   <owner>bolian@chromium.org</owner>
   <summary>
@@ -73322,7 +73340,9 @@ To add a new entry, add it with any value and run test to compute valid value.
 
 <histogram_suffixes name="DataReductionProxy.MimeType">
   <suffix name="Application" label="Application mime-type"/>
-  <suffix name="Unknown" label="Unknown mime-type"/>
+  <suffix name="Unknown"
+      label="Deprecated. Moved to UnknownMime in M46. Unknown mime-type"/>
+  <suffix name="UnknownMime" label="Unknown mime-type"/>
   <suffix name="Video" label="Video mime-type"/>
   <affected-histogram name="Net.DailyContentLength"/>
   <affected-histogram name="Net.DailyContentLength_DataReductionProxyEnabled"/>
-- 
2.11.4.GIT