Add metrics for DHCP WPAD feature.

net/proxy/dhcp_proxy_script_fetcher_win.cc

Index: net/proxy/dhcp_proxy_script_fetcher_win.cc
diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.cc b/net/proxy/dhcp_proxy_script_fetcher_win.cc
index 35109f608647e7a53974c190a4416aa705efdd94..b2faaaccc0bed2080998e1867faab42ecb4cfe71 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_win.cc
+++ b/net/proxy/dhcp_proxy_script_fetcher_win.cc
@@ -4,6 +4,8 @@
 
 #include "net/proxy/dhcp_proxy_script_fetcher_win.h"
 
+#include "base/metrics/histogram.h"
+#include "base/perftimer.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/dhcp_proxy_script_adapter_fetcher_win.h"
 
@@ -18,6 +20,14 @@ namespace {
 // adapter finishes first.
 const int kMaxWaitAfterFirstResultMs = 400;
 
+const int kGetAdaptersAddressesErrors[] = {
+  ERROR_ADDRESS_NOT_ASSOCIATED,
+  ERROR_BUFFER_OVERFLOW,
+  ERROR_INVALID_PARAMETER,
+  ERROR_NOT_ENOUGH_MEMORY,
+  ERROR_NO_DATA,
+};
+
 }  // namespace
 
 namespace net {
@@ -33,7 +43,8 @@ DhcpProxyScriptFetcherWin::DhcpProxyScriptFetcherWin(
 }
 
 DhcpProxyScriptFetcherWin::~DhcpProxyScriptFetcherWin() {
-  Cancel();
+  // Count as user-initiated if we are not yet in STATE_DONE.
+  CancelImpl(true);
 }
 
 int DhcpProxyScriptFetcherWin::Fetch(string16* utf16_text,
@@ -44,6 +55,8 @@ int DhcpProxyScriptFetcherWin::Fetch(string16* utf16_text,
     return ERR_UNEXPECTED;
   }
 
+  fetch_start_time_ = base::TimeTicks::Now();
+
   std::set<std::string> adapter_names;
   if (!ImplGetCandidateAdapterNames(&adapter_names)) {
     return ERR_UNEXPECTED;
@@ -70,6 +83,10 @@ int DhcpProxyScriptFetcherWin::Fetch(string16* utf16_text,
 }
 
 void DhcpProxyScriptFetcherWin::Cancel() {
+  CancelImpl(true);
+}
+
+void DhcpProxyScriptFetcherWin::CancelImpl(bool user_initiated) {

[jar (doing other things), 2011/05/23 19:37:52]

Please switch to using an enumerated type, rather than a boolean here to
increase readability.  I found it very confusing to read CancelImpl(false), and
thought it was saying we don't really want to cancel :-/, and so I was forced to
read header files (or implementation) to be able to read the code.

[Jói, 2011/05/24 00:58:38]

I don't think an enumerated type would be warranted since this is not a public
interface.  However, I agree with the spirit of the comment, that as is, the
"CancelImpl" name gives you no clue as to what the boolean argument does.  I
have split this up now so that the Cancel() function does the UMA bit, and
CancelImpl takes no parameters.  Hope that clears it up.

   DCHECK(CalledOnValidThread());
 
   if (state_ != STATE_DONE) {
@@ -83,6 +100,13 @@ void DhcpProxyScriptFetcherWin::Cancel() {
     }
 
     fetchers_.reset();
+
+    if (user_initiated) {
+      // We only count this stat if the cancel was explicitly initiated by
+      // our client, and if we weren't already in STATE_DONE.
+      UMA_HISTOGRAM_TIMES("Net.DhcpWpadCancelTime",
+                          base::TimeTicks::Now() - fetch_start_time_);
+    }
   }
 }
 
@@ -134,6 +158,14 @@ void DhcpProxyScriptFetcherWin::OnFetcherDone(int result) {
 
 void DhcpProxyScriptFetcherWin::OnWaitTimer() {
   DCHECK_EQ(state_, STATE_SOME_RESULTS);
+
+  // These are intended to help us understand whether our timeout may
+  // be too aggressive or not aggressive enough.
+  UMA_HISTOGRAM_COUNTS_100("Net.DhcpWpadNumAdaptersAtWaitTimer",
+                           fetchers_.size());
+  UMA_HISTOGRAM_COUNTS_100("Net.DhcpWpadNumPendingAdaptersAtWaitTimer",
+                           num_pending_fetchers_);
+
   TransitionToDone();
 }
 
@@ -172,10 +204,18 @@ void DhcpProxyScriptFetcherWin::TransitionToDone() {
     }
   }
 
-  Cancel();
+  CancelImpl(false);
   DCHECK_EQ(state_, STATE_DONE);
   DCHECK(fetchers_.empty());
 
+  UMA_HISTOGRAM_TIMES("Net.DhcpWpadCompletionTime",
+                      base::TimeTicks::Now() - fetch_start_time_);
+
+  if (result != OK) {
+    UMA_HISTOGRAM_CUSTOM_ENUMERATION(
+        "Net.DhcpWpadFetchError", std::abs(result), GetAllErrorCodesForUma());
+  }
+
   client_callback_->Run(result);
 }
 
@@ -204,6 +244,8 @@ bool DhcpProxyScriptFetcherWin::GetCandidateAdapterNames(
   scoped_ptr_malloc<IP_ADAPTER_ADDRESSES> adapters;
   ULONG error = ERROR_SUCCESS;
   int num_tries = 0;
+
+  PerfTimer time_api_access;
   do {
     adapters.reset(
         reinterpret_cast<IP_ADAPTER_ADDRESSES*>(malloc(adapters_size)));
@@ -219,6 +261,20 @@ bool DhcpProxyScriptFetcherWin::GetCandidateAdapterNames(
     ++num_tries;
   } while (error == ERROR_BUFFER_OVERFLOW && num_tries <= 3);
 
+  // This is primarily to validate our belief that the GetAdaptersAddresses API
+  // function is fast enough to call synchronously from the network thread.
+  UMA_HISTOGRAM_TIMES("Net.DhcpWpadGetAdaptersAddressesTime",
+                      time_api_access.Elapsed());
+
+  if (error != ERROR_SUCCESS) {
+    UMA_HISTOGRAM_CUSTOM_ENUMERATION(
+        "Net.DhcpWpadGetAdaptersAddressesError",
+        error,
+        base::CustomHistogram::ArrayToCustomRanges(
+            kGetAdaptersAddressesErrors,
+            arraysize(kGetAdaptersAddressesErrors)));
+  }
+
   if (error == ERROR_NO_DATA) {
     // There are no adapters that we care about.
     return true;