Job Controller: clean up metrics logging about the job racing result

net/http/http_server_properties.cc

 // Copyright (c) 2012 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 "net/http/http_server_properties.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/ssl/ssl_config.h"
 
 namespace net {
 
 const char kAlternativeServiceHeader[] = "Alt-Svc";
 
-void HistogramAlternateProtocolUsage(AlternateProtocolUsage usage) {
-  UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolUsage", usage,
-                            ALTERNATE_PROTOCOL_USAGE_MAX);
+AlternativeProxyUsage ConvertProtocolUsageToProxyUsage(
+    AlternateProtocolUsage usage) {
+  switch (usage) {
+    case ALTERNATE_PROTOCOL_USAGE_NO_RACE:
+      return ALTERNATIVE_PROXY_USAGE_NO_RACE;
+    case ALTERNATE_PROTOCOL_USAGE_WON_RACE:
+      return ALTERNATIVE_PROXY_USAGE_WON_RACE;
+    case ALTERNATE_PROTOCOL_USAGE_LOST_RACE:
+      return ALTERNATIVE_PROXY_USAGE_LOST_RACE;
+    default:

[tbansal1, 2016/09/22 17:53:02]

Add NOTREACHED() in default: so an error is triggered immediately in debug
builds.

[Zhongyi Shi, 2016/09/22 23:56:53]

Done.

+      return ALTERNATIVE_PROXY_USAGE_MAX;
+  }
+}
+
+void HistogramAlternateProtocolUsage(AlternateProtocolUsage usage,
+                                     bool proxy_server_used) {
+  if (proxy_server_used) {
+    DCHECK_LE(usage, ALTERNATE_PROTOCOL_USAGE_LOST_RACE);
+    UMA_HISTOGRAM_ENUMERATION("Net.QuicAlternativeProxy.Usage",
+                              ConvertProtocolUsageToProxyUsage(usage),
+                              ALTERNATIVE_PROXY_USAGE_MAX);
+  } else {
+    UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolUsage", usage,
+                              ALTERNATE_PROTOCOL_USAGE_MAX);
+  }
 }
 
 void HistogramBrokenAlternateProtocolLocation(
     BrokenAlternateProtocolLocation location){
   UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolBrokenLocation", location,
                             BROKEN_ALTERNATE_PROTOCOL_LOCATION_MAX);
 }
 
 bool IsAlternateProtocolValid(AlternateProtocol protocol) {
   return protocol >= ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION &&
@@ skipping 60 matching lines @@
       exploded.day_of_month, exploded.hour, exploded.minute, exploded.second);
 }
 
 // static
 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {
   ssl_config->alpn_protos.clear();
   ssl_config->alpn_protos.push_back(kProtoHTTP11);
 }
 
 }  // namespace net