Add Net.WebSocket.ResponseCode and ErrorCodes UMA

net/websockets/websocket_basic_handshake_stream.cc

 // Copyright 2013 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/websockets/websocket_basic_handshake_stream.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 #include <string>
@@ skipping 10 matching lines @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "crypto/random.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_body_drainer.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/http/http_stream_parser.h"
+#include "net/http/http_util.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/websockets/websocket_basic_stream.h"
 #include "net/websockets/websocket_deflate_predictor.h"
 #include "net/websockets/websocket_deflate_predictor_impl.h"
 #include "net/websockets/websocket_deflate_stream.h"
 #include "net/websockets/websocket_deflater.h"
 #include "net/websockets/websocket_extension_parser.h"
 #include "net/websockets/websocket_handshake_constants.h"
 #include "net/websockets/websocket_handshake_handler.h"
 #include "net/websockets/websocket_handshake_request_info.h"
@@ skipping 504 matching lines @@
                                            headers->response_code(),
                                            headers->GetStatusText(),
                                            headers,
                                            http_response_info_->response_time));
     connect_delegate_->OnFinishOpeningHandshake(response.Pass());
   }
 }
 
 int WebSocketBasicHandshakeStream::ValidateResponse(int rv) {
   DCHECK(http_response_info_);
-  const HttpResponseHeaders* headers = http_response_info_->headers.get();
+  // Most net errors happen during connection, so they are not seen by this
+  // method. The histogram for error codes is created in
+  // Delegate::OnResponseStarted in websocket_stream.cc instead.
   if (rv >= 0) {
-    switch (headers->response_code()) {
+    const HttpResponseHeaders* headers = http_response_info_->headers.get();
+    const int response_code = headers->response_code();
+    UMA_HISTOGRAM_CUSTOM_ENUMERATION(

[Alexei Svitkine (slow), 2014/06/17 15:34:27]

Use UMA_HISTOGRAM_SPARSE_SLOWLY() here too. It's more efficient than
UMA_HISTOGRAM_CUSTOM_ENUMERATION().

[Adam Rice, 2014/06/18 01:23:19]

Done.

+      "Net.WebSocket.ResponseCode",
+      HttpUtil::MapStatusCodeForHistogram(response_code),
+      // The third argument is only evaluated once.
+      HttpUtil::GetStatusCodesForHistogram());
+    switch (response_code) {
       case HTTP_SWITCHING_PROTOCOLS:
         OnFinishOpeningHandshake();
         return ValidateUpgradeResponse(headers);
 
       // We need to pass these through for authentication to work.
       case HTTP_UNAUTHORIZED:
       case HTTP_PROXY_AUTHENTICATION_REQUIRED:
         return OK;
 
       // Other status codes are potentially risky (see the warnings in the
@@ skipping 44 matching lines @@
                          &extensions_,
                          &failure_message_,
                          extension_params_.get())) {
     return OK;
   }
   failure_message_ = "Error during WebSocket handshake: " + failure_message_;
   return ERR_INVALID_RESPONSE;
 }
 
 }  // namespace net