Bug 1623867 - Get rid of expired cookies telemetry IDs, r=chutten

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

--HG--
extra : moz-landing-system : lando

netwerk/cookie/nsCookieService.cpp

@@ -3237,32 +3237,6 @@ bool nsCookieService::CanSetCookie(nsIURI* aHostURI, const nsCookieKey& aKey,
   // 3 = secure and "https:"
   bool potentiallyTurstworthy =
       nsMixedContentBlocker::IsPotentiallyTrustworthyOrigin(aHostURI);
-  Telemetry::Accumulate(Telemetry::COOKIE_SCHEME_SECURITY,
-                        ((aCookieData.isSecure()) ? 0x02 : 0x00) |
-                            ((potentiallyTurstworthy) ? 0x01 : 0x00));
-
-  // Collect telemetry on how often are first- and third-party cookies set
-  // from HTTPS origins:
-  //
-  // 0 (000) = first-party and "http:"
-  // 1 (001) = first-party and "http:" with bogus Secure cookie flag?!
-  // 2 (010) = first-party and "https:"
-  // 3 (011) = first-party and "https:" with Secure cookie flag
-  // 4 (100) = third-party and "http:"
-  // 5 (101) = third-party and "http:" with bogus Secure cookie flag?!
-  // 6 (110) = third-party and "https:"
-  // 7 (111) = third-party and "https:" with Secure cookie flag
-  if (aThirdPartyUtil) {
-    bool isThirdParty = true;
-
-    if (aChannel) {
-      aThirdPartyUtil->IsThirdPartyChannel(aChannel, aHostURI, &isThirdParty);
-    }
-    Telemetry::Accumulate(Telemetry::COOKIE_SCHEME_HTTPS,
-                          (isThirdParty ? 0x04 : 0x00) |
-                              (potentiallyTurstworthy ? 0x02 : 0x00) |
-                              (aCookieData.isSecure() ? 0x01 : 0x00));
-  }
 
   int64_t currentTimeInUsec = PR_Now();
 

toolkit/components/telemetry/Histograms.json

@@ -10826,26 +10826,6 @@
     "n_values": 8,
     "description": "When we record an upgrade due to HSTS, record the source of that HSTS entry. (0: HSTS preload list, 1: HSTS Header seen naturally, 2: HSTS priming)"
   },
-  "COOKIE_SCHEME_SECURITY": {
-    "record_in_processes": ["main", "content"],
-    "products": ["firefox", "fennec", "geckoview"],
-    "alert_emails": ["seceng-telemetry@mozilla.com"],
-    "expires_in_version": "60",
-    "kind": "enumerated",
-    "n_values": 10,
-    "releaseChannelCollection": "opt-out",
-    "description": "How often are secure cookies set from non-secure origins, and vice-versa? 0=nonsecure/http, 1=nonsecure/https, 2=secure/http, 3=secure/https"
-  },
-  "COOKIE_SCHEME_HTTPS": {
-    "record_in_processes": ["main", "content"],
-    "products": ["firefox", "fennec", "geckoview"],
-    "alert_emails": ["cpeterson@mozilla.com", "seceng-telemetry@mozilla.com"],
-    "bug_numbers": [1160368],
-    "expires_in_version": "60",
-    "kind": "enumerated",
-    "n_values": 10,
-    "description": "How often are first- and third-party cookies set from HTTPS origins? 0=first/http, 1=first/http+secure?!, 2=first/https, 3=first/https+secure, 4=third/http, 5=third/http+secure?!, 6=third/https, 7=third/https+secure"
-  },
   "COOKIE_TIME_MOVING_MS": {
     "record_in_processes": ["content"],
     "products": ["firefox", "fennec", "geckoview"],

toolkit/components/telemetry/histogram-allowlists.json

@@ -469,7 +469,6 @@
     "CHECK_ADDONS_MODIFIED_MS",
     "COMPONENTS_SHIM_ACCESSED_BY_CONTENT",
     "COMPOSITE_FRAME_ROUNDTRIP_TIME",
-    "COOKIE_SCHEME_SECURITY",
     "CRASH_STORE_COMPRESSED_BYTES",
     "CYCLE_COLLECTOR",
     "CYCLE_COLLECTOR_ASYNC_SNOW_WHITE_FREEING",