From e19cd483fd697b5b43b3231cbbe18fdb91d4a69b Mon Sep 17 00:00:00 2001
From: Valentin Gosu <valentin.gosu@gmail.com>
Date: Fri, 28 Jun 2019 11:42:14 +0000
Subject: [PATCH] Bug 1395914 - Update histogram with two new values for IPv6
 network-id changes r=michal

Differential Revision: https://phabricator.services.mozilla.com/D34905

--HG--
extra : moz-landing-system : lando
---
 netwerk/system/linux/nsNotifyAddrListener_Linux.cpp | 10 +++++-----
 netwerk/system/mac/nsNetworkLinkService.mm          | 10 +++++-----
 netwerk/system/win32/nsNotifyAddrListener.cpp       |  6 +++---
 toolkit/components/telemetry/Histograms.json        |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp b/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp
index 75601477ba3c..4300d1fda569 100644
--- a/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp
+++ b/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp
@@ -266,20 +266,20 @@ void nsNotifyAddrListener::calculateNetworkId(void) {
     if (mNetworkId != output) {
       // new id
       if (found4 && !found6) {
-        Telemetry::Accumulate(Telemetry::NETWORK_ID, 1);  // IPv4 only
+        Telemetry::Accumulate(Telemetry::NETWORK_ID2, 1);  // IPv4 only
       } else if (!found4 && found6) {
-        Telemetry::Accumulate(Telemetry::NETWORK_ID, 3);  // IPv6 only
+        Telemetry::Accumulate(Telemetry::NETWORK_ID2, 3);  // IPv6 only
       } else {
-        Telemetry::Accumulate(Telemetry::NETWORK_ID, 4);  // Both!
+        Telemetry::Accumulate(Telemetry::NETWORK_ID2, 4);  // Both!
       }
       mNetworkId = output;
     } else {
       // same id
-      Telemetry::Accumulate(Telemetry::NETWORK_ID, 2);
+      Telemetry::Accumulate(Telemetry::NETWORK_ID2, 2);
     }
   } else {
     // no id
-    Telemetry::Accumulate(Telemetry::NETWORK_ID, 0);
+    Telemetry::Accumulate(Telemetry::NETWORK_ID2, 0);
   }
 }
 
diff --git a/netwerk/system/mac/nsNetworkLinkService.mm b/netwerk/system/mac/nsNetworkLinkService.mm
index fd771f323cc8..221f340600ec 100644
--- a/netwerk/system/mac/nsNetworkLinkService.mm
+++ b/netwerk/system/mac/nsNetworkLinkService.mm
@@ -334,20 +334,20 @@ void nsNetworkLinkService::calculateNetworkId(void) {
     if (mNetworkId != output) {
       // new id
       if (found4 && !found6) {
-        Telemetry::Accumulate(Telemetry::NETWORK_ID, 1);  // IPv4 only
+        Telemetry::Accumulate(Telemetry::NETWORK_ID2, 1);  // IPv4 only
       } else if (!found4 && found6) {
-        Telemetry::Accumulate(Telemetry::NETWORK_ID, 3);  // IPv6 only
+        Telemetry::Accumulate(Telemetry::NETWORK_ID2, 3);  // IPv6 only
       } else {
-        Telemetry::Accumulate(Telemetry::NETWORK_ID, 4);  // Both!
+        Telemetry::Accumulate(Telemetry::NETWORK_ID2, 4);  // Both!
       }
       mNetworkId = output;
     } else {
       // same id
-      Telemetry::Accumulate(Telemetry::NETWORK_ID, 2);
+      Telemetry::Accumulate(Telemetry::NETWORK_ID2, 2);
     }
   } else {
     // no id
-    Telemetry::Accumulate(Telemetry::NETWORK_ID, 0);
+    Telemetry::Accumulate(Telemetry::NETWORK_ID2, 0);
   }
 }
 
diff --git a/netwerk/system/win32/nsNotifyAddrListener.cpp b/netwerk/system/win32/nsNotifyAddrListener.cpp
index 8f8ee6abab30..578d07f50bf4 100644
--- a/netwerk/system/win32/nsNotifyAddrListener.cpp
+++ b/netwerk/system/win32/nsNotifyAddrListener.cpp
@@ -212,11 +212,11 @@ bool nsNotifyAddrListener::findMac(char* gateway) {
           LOG(("networkid: id %s\n", output.get()));
           if (mNetworkId != output) {
             // new id
-            Telemetry::Accumulate(Telemetry::NETWORK_ID, 1);
+            Telemetry::Accumulate(Telemetry::NETWORK_ID2, 1);
             mNetworkId = output;
           } else {
             // same id
-            Telemetry::Accumulate(Telemetry::NETWORK_ID, 2);
+            Telemetry::Accumulate(Telemetry::NETWORK_ID2, 2);
           }
           found = true;
           break;
@@ -281,7 +281,7 @@ void nsNotifyAddrListener::calculateNetworkId(void) {
   }
   if (!found) {
     // no id
-    Telemetry::Accumulate(Telemetry::NETWORK_ID, 0);
+    Telemetry::Accumulate(Telemetry::NETWORK_ID2, 0);
   }
 }
 
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 34c182adf75d..3510a900aca8 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -4832,14 +4832,14 @@
     "n_buckets": 10,
     "description": "Time spent (ms) during showdown deleting disk cache v2 for 'clear private data' option"
   },
-  "NETWORK_ID": {
-    "record_in_processes": ["main", "content"],
+  "NETWORK_ID2": {
+    "record_in_processes": ["main"],
     "alert_emails": ["necko@mozilla.com"],
-    "bug_numbers": [1240932],
+    "bug_numbers": [1240932, 1395914],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 6,
-    "description": "Network identification (0=None, 1=New, 2=Same)"
+    "description": "Network identification (0=None, 1=New Ipv4, 2=Same, 3=New IPv6, 4=New dual)"
   },
   "IDLE_NOTIFY_IDLE_MS": {
     "record_in_processes": ["main", "content"],