Bug 1645083 - Remove probes: SESSION_RESUMPTION_WITH_*, r=dragana

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

security/manager/ssl/nsNSSCallbacks.cpp

@@ -1394,10 +1394,8 @@ void HandshakeCallback(PRFileDesc* fd, void* client_data) {
   } else {
     if (StaticPrefs::network_ssl_tokens_cache_enabled()) {
       RebuildCertificateInfoFromSSLTokenCache(infoObject);
-      infoObject->NoteSessionResumptionTime(true);
     } else {
       RebuildVerifiedCertificateInformation(fd, infoObject);
-      infoObject->NoteSessionResumptionTime(false);
     }
   }
 

security/manager/ssl/nsNSSIOLayer.cpp

@@ -209,17 +209,6 @@ void nsNSSSocketInfo::NoteTimeUntilReady() {
           ("[%p] nsNSSSocketInfo::NoteTimeUntilReady\n", mFd));
 }
 
-void nsNSSSocketInfo::NoteSessionResumptionTime(bool aUsingExternalCache) {
-  // This will include TCP and proxy tunnel wait time
-  Telemetry::AccumulateTimeDelta(
-      aUsingExternalCache
-          ? Telemetry::
-                SESSION_RESUMPTION_WITH_EXTERNAL_CACHE_TIME_UNTIL_READY_MS
-          : Telemetry::
-                SESSION_RESUMPTION_WITH_INTERNAL_CACHE_TIME_UNTIL_READY_MS,
-      mSocketCreationTimestamp, TimeStamp::Now());
-}
-
 void nsNSSSocketInfo::SetHandshakeCompleted() {
   if (!mHandshakeCompleted) {
     enum HandshakeType {

security/manager/ssl/nsNSSIOLayer.h

@@ -78,7 +78,6 @@ class nsNSSSocketInfo final : public CommonSocketControl {
   void SetHandshakeCompleted();
   bool IsHandshakeCompleted() const { return mHandshakeCompleted; }
   void NoteTimeUntilReady();
-  void NoteSessionResumptionTime(bool aUsingExternalCache);
 
   void SetFalseStartCallbackCalled() { mFalseStartCallbackCalled = true; }
   void SetFalseStarted() { mFalseStarted = true; }

toolkit/components/telemetry/Histograms.json

@@ -15153,28 +15153,6 @@
     "n_buckets": 50,
     "description": "Time in milliseconds spent in the layout system per Refresh Driver tick."
   },
-  "SESSION_RESUMPTION_WITH_INTERNAL_CACHE_TIME_UNTIL_READY_MS": {
-    "record_in_processes": ["main"],
-    "products": ["firefox", "fennec"],
-    "alert_emails": ["necko@mozilla.com", "kershaw@mozilla.com"],
-    "expires_in_version": "80",
-    "kind": "exponential",
-    "high": 10000,
-    "n_buckets": 100,
-    "bug_numbers": [1597956, 1614905],
-    "description": "milliseconds to complete a TLS session resumption with internal cache"
-  },
-  "SESSION_RESUMPTION_WITH_EXTERNAL_CACHE_TIME_UNTIL_READY_MS": {
-    "record_in_processes": ["main"],
-    "products": ["firefox", "fennec"],
-    "alert_emails": ["necko@mozilla.com", "kershaw@mozilla.com"],
-    "expires_in_version": "80",
-    "kind": "exponential",
-    "high": 10000,
-    "n_buckets": 100,
-    "bug_numbers": [1597956, 1614905],
-    "description": "milliseconds to complete a TLS session resumption with external cache"
-  },
   "WINDOW_OPEN_OUTER_SIZE": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox"],