diff --git a/security/manager/ssl/nsNSSCallbacks.cpp b/security/manager/ssl/nsNSSCallbacks.cpp index 963bebe28180..a04a10889e2f 100644 --- a/security/manager/ssl/nsNSSCallbacks.cpp +++ b/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); } } diff --git a/security/manager/ssl/nsNSSIOLayer.cpp b/security/manager/ssl/nsNSSIOLayer.cpp index 621451c60f16..a5317a9adb9b 100644 --- a/security/manager/ssl/nsNSSIOLayer.cpp +++ b/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 { diff --git a/security/manager/ssl/nsNSSIOLayer.h b/security/manager/ssl/nsNSSIOLayer.h index 56d8df47d19b..c29616aca743 100644 --- a/security/manager/ssl/nsNSSIOLayer.h +++ b/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; } diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index bd712ac7db20..3758c577d2eb 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/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"],