Bug 1513839 - Make SSL_TIME_UNTIL_HANDSHAKE_FINISHED keyed by kea gro…

…up r=keeler,jcj

This collects SSL_TIME_UNTIL_HANDSHAKE_FINISHED dependent on the key group used. This is nice to have in general and especially for the ecdhe-sidh thing.

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

security/manager/ssl/nsNSSIOLayer.cpp

@@ -286,8 +286,9 @@ void nsNSSSocketInfo::SetHandshakeCompleted() {
                                                  : NotAllowedToFalseStart;
 
     // This will include TCP and proxy tunnel wait time
-    Telemetry::AccumulateTimeDelta(Telemetry::SSL_TIME_UNTIL_HANDSHAKE_FINISHED,
-                                   mSocketCreationTimestamp, TimeStamp::Now());
+    Telemetry::AccumulateTimeDelta(
+        Telemetry::SSL_TIME_UNTIL_HANDSHAKE_FINISHED_KEYED_BY_KA, mKeaGroup,
+        mSocketCreationTimestamp, TimeStamp::Now());
 
     // If the handshake is completed for the first time from just 1 callback
     // that means that TLS session resumption must have been used.

toolkit/components/telemetry/Histograms.json

@@ -2261,16 +2261,17 @@
     "n_buckets": 200,
     "description": "ms of SSL wait time including TCP and proxy tunneling"
   },
-  "SSL_TIME_UNTIL_HANDSHAKE_FINISHED": {
+  "SSL_TIME_UNTIL_HANDSHAKE_FINISHED_KEYED_BY_KA": {
     "record_in_processes": ["main", "content"],
-    "alert_emails": ["seceng-telemetry@mozilla.com"],
-    "bug_numbers": [1340021],
+    "alert_emails": ["seceng-telemetry@mozilla.com", "fkiefer@mozilla.com"],
+    "bug_numbers": [1340021, 1513839],
     "releaseChannelCollection": "opt-out",
     "expires_in_version": "never",
     "kind": "exponential",
+    "keyed": true,
     "high": 60000,
     "n_buckets": 200,
-    "description": "ms of SSL wait time for full handshake including TCP and proxy tunneling"
+    "description": "ms of SSL wait time for full handshake including TCP and proxy tunneling, keyed by the key exchange algorithm used"
   },
   "SSL_BYTES_BEFORE_CERT_CALLBACK": {
     "record_in_processes": ["main", "content"],

toolkit/components/telemetry/histogram-whitelists.json

@@ -1215,7 +1215,7 @@
     "SYSTEM_FONT_FALLBACK_SCRIPT",
     "HTTP_REQUEST_PER_PAGE_FROM_CACHE",
     "SSL_TIME_UNTIL_READY",
-    "SSL_TIME_UNTIL_HANDSHAKE_FINISHED",
+    "SSL_TIME_UNTIL_HANDSHAKE_FINISHED_KEYED_BY_KA",
     "CERT_VALIDATION_HTTP_REQUEST_CANCELED_TIME",
     "CERT_VALIDATION_HTTP_REQUEST_SUCCEEDED_TIME",
     "CERT_VALIDATION_HTTP_REQUEST_FAILED_TIME",