Bug 923248 - Fix typo in proxy/direct NTLM module telemetry accumulation, r=jduell
authorHonza Bambas <honzab.moz@firemni.cz>
Thu, 10 Oct 2013 19:10:45 +0200
changeset 150379 0194c6474d7ad1ec14cc8a1b1f70f06afb111f7e
parent 150378 ffbc9ebb069990f2f49535f7f14ee0c45ad62f5a
child 150380 e3be5e632c351103fd20e5bfa3ec0af96274fea5
push id25437
push userkwierso@gmail.com
push dateFri, 11 Oct 2013 02:00:22 +0000
treeherdermozilla-central@672cd63528d3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjduell
bugs923248
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 923248 - Fix typo in proxy/direct NTLM module telemetry accumulation, r=jduell
extensions/auth/nsAuthGSSAPI.cpp
extensions/auth/nsAuthSSPI.cpp
extensions/auth/nsAuthSambaNTLM.cpp
security/manager/ssl/src/nsNTLMAuthModule.cpp
toolkit/components/telemetry/Histograms.json
--- a/extensions/auth/nsAuthGSSAPI.cpp
+++ b/extensions/auth/nsAuthGSSAPI.cpp
@@ -353,18 +353,18 @@ nsAuthGSSAPI::Init(const char *serviceNa
        return NS_ERROR_NOT_INITIALIZED;
 
     mServiceName = serviceName;
     mServiceFlags = serviceFlags;
 
     static bool sTelemetrySent = false;
     if (!sTelemetrySent) {
         mozilla::Telemetry::Accumulate(
-            mozilla::Telemetry::NTLM_MODULE_USED,
-            serviceFlags | nsIAuthModule::REQ_PROXY_AUTH
+            mozilla::Telemetry::NTLM_MODULE_USED_2,
+            serviceFlags & nsIAuthModule::REQ_PROXY_AUTH
                 ? NTLM_MODULE_KERBEROS_PROXY
                 : NTLM_MODULE_KERBEROS_DIRECT);
         sTelemetrySent = true;
     }
 
     return NS_OK;
 }
 
--- a/extensions/auth/nsAuthSSPI.cpp
+++ b/extensions/auth/nsAuthSSPI.cpp
@@ -273,18 +273,18 @@ nsAuthSSPI::Init(const char *serviceName
                                            &mCred,
                                            &useBefore);
     if (rc != SEC_E_OK)
         return NS_ERROR_UNEXPECTED;
 
     static bool sTelemetrySent = false;
     if (!sTelemetrySent) {
         mozilla::Telemetry::Accumulate(
-            mozilla::Telemetry::NTLM_MODULE_USED,
-            serviceFlags | nsIAuthModule::REQ_PROXY_AUTH
+            mozilla::Telemetry::NTLM_MODULE_USED_2,
+            serviceFlags & nsIAuthModule::REQ_PROXY_AUTH
                 ? NTLM_MODULE_WIN_API_PROXY
                 : NTLM_MODULE_WIN_API_DIRECT);
         sTelemetrySent = true;
     }
 
     LOG(("AcquireCredentialsHandle() succeeded.\n"));
     return NS_OK;
 }
--- a/extensions/auth/nsAuthSambaNTLM.cpp
+++ b/extensions/auth/nsAuthSambaNTLM.cpp
@@ -210,18 +210,18 @@ nsAuthSambaNTLM::Init(const char *servic
                       const PRUnichar *username,
                       const PRUnichar *password)
 {
     NS_ASSERTION(!username && !domain && !password, "unexpected credentials");
 
     static bool sTelemetrySent = false;
     if (!sTelemetrySent) {
         mozilla::Telemetry::Accumulate(
-            mozilla::Telemetry::NTLM_MODULE_USED,
-            serviceFlags | nsIAuthModule::REQ_PROXY_AUTH
+            mozilla::Telemetry::NTLM_MODULE_USED_2,
+            serviceFlags & nsIAuthModule::REQ_PROXY_AUTH
                 ? NTLM_MODULE_SAMBA_AUTH_PROXY
                 : NTLM_MODULE_SAMBA_AUTH_DIRECT);
         sTelemetrySent = true;
     }
 
     return NS_OK;
 }
 
--- a/security/manager/ssl/src/nsNTLMAuthModule.cpp
+++ b/security/manager/ssl/src/nsNTLMAuthModule.cpp
@@ -773,18 +773,18 @@ nsNTLMAuthModule::Init(const char      *
 
   mDomain = domain;
   mUsername = username;
   mPassword = password;
 
   static bool sTelemetrySent = false;
   if (!sTelemetrySent) {
       mozilla::Telemetry::Accumulate(
-          mozilla::Telemetry::NTLM_MODULE_USED,
-          serviceFlags | nsIAuthModule::REQ_PROXY_AUTH
+          mozilla::Telemetry::NTLM_MODULE_USED_2,
+          serviceFlags & nsIAuthModule::REQ_PROXY_AUTH
               ? NTLM_MODULE_GENERIC_PROXY
               : NTLM_MODULE_GENERIC_DIRECT);
       sTelemetrySent = true;
   }
 
   return NS_OK;
 }
 
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -4083,20 +4083,20 @@
     "n_values": 4,
     "description": "Accumulates type of content (mixed, mixed passive, unmixed) per page load"
   },
   "MIXED_CONTENT_UNBLOCK_COUNTER": {
     "kind": "enumerated",
     "n_values": 3,
     "description": "A simple counter of daily mixed-content unblock operations and top documents loaded"
   },
-  "NTLM_MODULE_USED": {
+  "NTLM_MODULE_USED_2": {
     "kind": "enumerated",
     "n_values": 8,
-    "description": "The module used for the NTLM protocol (Windows_API, Kerberos, Samba_auth or Generic) and whether or not the authentication was used to connect to a proxy server. This data is collected only once per session (at first NTLM authentification)."
+    "description": "The module used for the NTLM protocol (Windows_API, Kerberos, Samba_auth or Generic) and whether or not the authentication was used to connect to a proxy server. This data is collected only once per session (at first NTLM authentification) ; fixed version."
   },
   "FX_THUMBNAILS_BG_QUEUE_SIZE_ON_CAPTURE": {
     "kind": "exponential",
     "high": 100,
     "n_buckets": 15,
     "extended_statistics_ok": true,
     "description": "BACKGROUND THUMBNAILS: Size of capture queue when a capture request is received"
   },