Bug 1722895 - Add new Telemetry for https-only/ first for LABELS_HTTP_SCHEME_UPGRADE_TYPE r=necko-reviewers,valentin

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

netwerk/base/nsNetUtil.cpp

@@ -2937,9 +2937,16 @@ static bool ShouldSecureUpgradeNoHSTS(nsIURI* aURI, nsILoadInfo* aLoadInfo) {
     return true;
   }
 
-  // 4. Https-Only / -First
-  if (nsHTTPSOnlyUtils::ShouldUpgradeRequest(aURI, aLoadInfo) ||
-      nsHTTPSOnlyUtils::ShouldUpgradeHttpsFirstRequest(aURI, aLoadInfo)) {
+  // 4. Https-Only
+  if (nsHTTPSOnlyUtils::ShouldUpgradeRequest(aURI, aLoadInfo)) {
+    Telemetry::AccumulateCategorical(
+        Telemetry::LABELS_HTTP_SCHEME_UPGRADE_TYPE::HTTPSOnly);
+    return true;
+  }
+  // 4.a Https-First
+  if (nsHTTPSOnlyUtils::ShouldUpgradeHttpsFirstRequest(aURI, aLoadInfo)) {
+    Telemetry::AccumulateCategorical(
+        Telemetry::LABELS_HTTP_SCHEME_UPGRADE_TYPE::HTTPSFirst);
     return true;
   }
   return false;

toolkit/components/telemetry/Histograms.json

@@ -2800,12 +2800,12 @@
   "HTTP_SCHEME_UPGRADE_TYPE": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox", "fennec"],
-    "alert_emails": ["seceng-telemetry@mozilla.com", "jkt@mozilla.com"],
-    "bug_numbers": [1340021, 1435733],
+    "alert_emails": ["seceng-telemetry@mozilla.com", "freddyb@mozilla.com"],
+    "bug_numbers": [1340021, 1435733, 1722895],
     "releaseChannelCollection": "opt-out",
     "expires_in_version": "never",
     "kind": "categorical",
-    "labels": ["AlreadyHTTPS", "NoReasonToUpgrade", "PrefBlockedSTS", "STS", "CSP", "BrowserDisplay"],
+    "labels": ["AlreadyHTTPS", "NoReasonToUpgrade", "PrefBlockedSTS", "STS", "CSP", "BrowserDisplay", "HTTPSOnly", "HTTPSFirst"],
     "description": "Was the URL upgraded to HTTPS?"
   },
   "HTTP_RESPONSE_STATUS_CODE": {