DataReductionProxy.BypassedBytes.ShortAudioVideo UMA reports collateral damage

components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h"
 
 #include "base/metrics/histogram.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_retry_info.h"
 #include "net/proxy/proxy_server.h"
@@ skipping 121 matching lines @@
                         DataReductionProxyUsageStats::LOCAL_BYPASS_RULES,
                         content_length);
     return;
   }
 
   if (triggering_request_) {
     RecordBypassedBytes(last_bypass_type_,
                         DataReductionProxyUsageStats::TRIGGERING_REQUEST,
                         content_length);
     triggering_request_ = false;
-  }
 
-  std::string mime_type;
-  request.GetMimeType(&mime_type);
-  // MIME types are named by <media-type>/<subtype>. We check to see if the
-  // media type is audio or video.
-  if (mime_type.compare(0, 6, "audio/") == 0  ||
-      mime_type.compare(0, 6, "video/") == 0) {
-    RecordBypassedBytes(last_bypass_type_,
-                        DataReductionProxyUsageStats::AUDIO_VIDEO,
-                        content_length);
+    // We only record when audio or video triggers a bypass. We don't care
+    // about audio and video bypassed as collateral damage.
+    std::string mime_type;
+    request.GetMimeType(&mime_type);
+    // MIME types are named by <media-type>/<subtype>. We check to see if the
+    // media type is audio or video.
+    if (mime_type.compare(0, 6, "audio/") == 0  ||
+        mime_type.compare(0, 6, "video/") == 0) {
+      RecordBypassedBytes(last_bypass_type_,
+                          DataReductionProxyUsageStats::AUDIO_VIDEO,
+                          content_length);
+    }
   }
 
   if (last_bypass_type_ != ProxyService::BYPASS_EVENT_TYPE_MAX) {
     RecordBypassedBytes(last_bypass_type_,
                         DataReductionProxyUsageStats::BYPASSED_BYTES_TYPE_MAX,
                         content_length);
     return;
   }
 
   if (data_reduction_proxy_params_->
@@ skipping 21 matching lines @@
           "DataReductionProxy.BypassedBytes.SSL", content_length);
       break;
     case DataReductionProxyUsageStats::LOCAL_BYPASS_RULES:
       UMA_HISTOGRAM_COUNTS(
           "DataReductionProxy.BypassedBytes.LocalBypassRules",
           content_length);
       break;
     case DataReductionProxyUsageStats::AUDIO_VIDEO:
       if (last_bypass_type_ == ProxyService::SHORT_BYPASS) {
         UMA_HISTOGRAM_COUNTS(
-            "DataReductionProxy.BypassedBytes.ShortAudioVideo",
+            "DataReductionProxy.BypassedBytes.ShortTriggeringRequestAudioVideo",

[Alexei Svitkine (slow), 2014/08/12 14:32:37]

Did you mean to not rename this?

[megjablon, 2014/08/12 16:53:59]

Ah sorry didn't mean to send that message yet. I thought this comment was in a
different location. It's fixed now. 

             content_length);
       }
       break;
     case DataReductionProxyUsageStats::TRIGGERING_REQUEST:
       switch (bypass_type) {
         case ProxyService::SHORT_BYPASS:
           UMA_HISTOGRAM_COUNTS(
               "DataReductionProxy.BypassedBytes.ShortTriggeringRequest",
               content_length);
           break;
@@ skipping 68 matching lines @@
         default:
           break;
       }
       break;
   }
 }
 
 }  // namespace data_reduction_proxy