commit a72a79ca06e42b537a7785a00303c5af11d3f768
author Paul Stewart <pstew@chromium.org> Mon Jul 21 13:52:03 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jul 22 06:33:33 2014 +0000
tree e88dd4ca705b083c853a221dbaabfbde63b69919
parent 6d4836bd3e385b8929597c366b4d5ba969f5cd04

shill: Metrics: Small histogram mods for DHCP

Responding to feedback for histograms.xml, I've made two small
changes:

  - Changed from "Dhcp" to "DHCP" in the histogram name in order
    to harmonize with "Network.Shill.DHCPOptionFailureDetected".
  - Changed the enum to be 0-based instead of 1-based.

BUG=chromium:384897
TEST=Unit tests

Change-Id: If346f0aba04fd77c399ffbebe75631be71a3ba98
Reviewed-on: https://chromium-review.googlesource.com/209171
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Queue: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>

metrics.cc

diff --git a/metrics.cc b/metrics.cc
index a1b216b..2c50a97 100644
--- a/metrics.cc
+++ b/metrics.cc
@@ -314,7 +314,7 @@
 
 // static
 const char Metrics::kMetricDhcpClientStatus[] =
-    "Network.Shill.DhcpClientStatus";
+    "Network.Shill.DHCPClientStatus";
 
 Metrics::Metrics(EventDispatcher *dispatcher)
     : dispatcher_(dispatcher),

metrics.h

diff --git a/metrics.h b/metrics.h
index ebb1e74..21e26c5 100644
--- a/metrics.h
+++ b/metrics.h
@@ -313,22 +313,22 @@
   };
 
   enum DhcpClientStatus {
-    kDhcpClientStatusArpGateway = 1,
-    kDhcpClientStatusArpSelf = 2,
-    kDhcpClientStatusBound = 3,
-    kDhcpClientStatusDiscover = 4,
-    kDhcpClientStatusIgnoreAdditionalOffer = 5,
-    kDhcpClientStatusIgnoreFailedOffer = 6,
-    kDhcpClientStatusIgnoreInvalidOffer = 7,
-    kDhcpClientStatusIgnoreNonOffer = 8,
-    kDhcpClientStatusInform = 9,
-    kDhcpClientStatusInit = 10,
-    kDhcpClientStatusNakDefer = 11,
-    kDhcpClientStatusRebind = 12,
-    kDhcpClientStatusReboot = 13,
-    kDhcpClientStatusRelease = 14,
-    kDhcpClientStatusRenew = 15,
-    kDhcpClientStatusRequest = 16,
+    kDhcpClientStatusArpGateway = 0,
+    kDhcpClientStatusArpSelf = 1,
+    kDhcpClientStatusBound = 2,
+    kDhcpClientStatusDiscover = 3,
+    kDhcpClientStatusIgnoreAdditionalOffer = 4,
+    kDhcpClientStatusIgnoreFailedOffer = 5,
+    kDhcpClientStatusIgnoreInvalidOffer = 6,
+    kDhcpClientStatusIgnoreNonOffer = 7,
+    kDhcpClientStatusInform = 8,
+    kDhcpClientStatusInit = 9,
+    kDhcpClientStatusNakDefer = 10,
+    kDhcpClientStatusRebind = 11,
+    kDhcpClientStatusReboot = 12,
+    kDhcpClientStatusRelease = 13,
+    kDhcpClientStatusRenew = 14,
+    kDhcpClientStatusRequest = 15,
     kDhcpClientStatusMax
   };
 

metrics_unittest.cc

diff --git a/metrics_unittest.cc b/metrics_unittest.cc
index a0b92c4..816a246 100644
--- a/metrics_unittest.cc
+++ b/metrics_unittest.cc
@@ -783,7 +783,7 @@
 
 TEST_F(MetricsTest, NotifyDhcpClientStatus) {
   EXPECT_CALL(library_,
-      SendEnumToUMA("Network.Shill.DhcpClientStatus",
+      SendEnumToUMA("Network.Shill.DHCPClientStatus",
                     Metrics::kDhcpClientStatusReboot,
                     Metrics::kDhcpClientStatusMax));
   metrics_.NotifyDhcpClientStatus(Metrics::kDhcpClientStatusReboot);