--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -1700,36 +1700,45 @@
},
"HTTP_PROXY_TYPE": {
"expires_in_version": "never",
"kind": "enumerated",
"n_values": 8,
"description": "HTTP Proxy Type (none, http, socks)"
},
"HTTP_TRANSACTION_IS_SSL": {
- "expires_in_version": "never",
- "kind": "boolean",
- "description": "Whether a HTTP transaction was over SSL or not."
+ "alert_emails": ["seceng-telemetry@mozilla.com"],
+ "bug_numbers": [1340021],
+ "releaseChannelCollection": "opt-out",
+ "expires_in_version": "never",
+ "kind": "boolean",
+ "description": "Whether an HTTP request occurred over TLS/SSL or not. Recorded during response processing for all requests."
},
"HTTP_PAGELOAD_IS_SSL": {
- "expires_in_version": "never",
- "kind": "boolean",
- "description": "Whether a HTTP base page load was over SSL or not."
+ "alert_emails": ["seceng-telemetry@mozilla.com"],
+ "bug_numbers": [1340021],
+ "releaseChannelCollection": "opt-out",
+ "expires_in_version": "never",
+ "kind": "boolean",
+ "description": "Whether a HTTP page load was over SSL or not. Recorded during response processing for all first-party page loads."
},
"HTTP_TRANSACTION_USE_ALTSVC": {
"expires_in_version": "never",
"kind": "boolean",
"description": "Whether a HTTP transaction was routed via Alt-Svc or not."
},
"HTTP_TRANSACTION_USE_ALTSVC_OE": {
"expires_in_version": "never",
"kind": "boolean",
"description": "Whether a HTTP transaction routed via Alt-Svc was scheme=http"
},
"HTTP_SCHEME_UPGRADE": {
+ "alert_emails": ["seceng-telemetry@mozilla.com"],
+ "bug_numbers": [1340021],
+ "releaseChannelCollection": "opt-out",
"expires_in_version": "never",
"kind": "enumerated",
"n_values": 10,
"description": "Was the URL upgraded to HTTPS? (0=already HTTPS, 1=no reason to upgrade, 2=STS upgrade blocked by pref, 3=upgraded with STS, 4=upgraded with CSP)"
},
"HTTP_RESPONSE_STATUS_CODE": {
"alert_emails": ["ckerschbaumer@mozilla.com"],
"bug_numbers": [1272345, 1296287],
@@ -1918,40 +1927,46 @@
"high": 60000,
"n_buckets": 100,
"description": "Amount of bytes sent using TLS early data at the start of a TLS connection for a given channel.",
"alert_emails": ["necko@mozilla.com"],
"bug_numbers": [1296288]
},
"SSL_HANDSHAKE_VERSION": {
"alert_emails": ["seceng-telemetry@mozilla.com"],
- "bug_numbers": [1250568],
+ "bug_numbers": [1250568,1340021],
+ "releaseChannelCollection": "opt-out",
"expires_in_version": "never",
"kind": "enumerated",
"n_values": 16,
- "description": "SSL Version (1=tls1, 2=tls1.1, 3=tls1.2, 4=tls1.3)"
+ "description": "Negotiated SSL Version (1=tls1, 2=tls1.1, 3=tls1.2, 4=tls1.3)"
},
"SSL_HANDSHAKE_RESULT": {
"alert_emails": ["seceng-telemetry@mozilla.com"],
- "bug_numbers": [1331280],
+ "bug_numbers": [1331280,1340021],
+ "releaseChannelCollection": "opt-out",
"expires_in_version": "never",
"kind": "enumerated",
"n_values": 672,
"description": "SSL handshake result, 0=success, 1-255=NSS error offset, 256-511=SEC error offset + 256, 512-639=NSPR error offset + 512, 640-670=PKIX error, 671=unknown err"
},
"SSL_TIME_UNTIL_READY": {
"alert_emails": ["seceng-telemetry@mozilla.com"],
+ "bug_numbers": [1340021],
+ "releaseChannelCollection": "opt-out",
"expires_in_version": "never",
"kind": "exponential",
"high": 60000,
"n_buckets": 200,
"description": "ms of SSL wait time including TCP and proxy tunneling"
},
"SSL_TIME_UNTIL_HANDSHAKE_FINISHED": {
"alert_emails": ["seceng-telemetry@mozilla.com"],
+ "bug_numbers": [1340021],
+ "releaseChannelCollection": "opt-out",
"expires_in_version": "never",
"kind": "exponential",
"high": 60000,
"n_buckets": 200,
"description": "ms of SSL wait time for full handshake including TCP and proxy tunneling"
},
"SSL_BYTES_BEFORE_CERT_CALLBACK": {
"alert_emails": ["seceng-telemetry@mozilla.com"],
@@ -1965,19 +1980,21 @@
"alert_emails": ["seceng-telemetry@mozilla.com"],
"expires_in_version": "never",
"kind": "enumerated",
"n_values": 16,
"description": "NPN Results (0=none, 1=negotiated, 2=no-overlap, 3=selected(alpn))"
},
"SSL_RESUMED_SESSION": {
"alert_emails": ["seceng-telemetry@mozilla.com"],
- "expires_in_version": "never",
- "kind": "boolean",
- "description": "complete TLS connect that used TLS Sesison Resumption"
+ "bug_numbers": [1340021],
+ "releaseChannelCollection": "opt-out",
+ "expires_in_version": "never",
+ "kind": "boolean",
+ "description": "complete TLS connect that used TLS Session Resumption (collected at same time as SSL_TIME_UNTIL_HANDSHAKE_FINISHED)"
},
"CERT_VALIDATION_HTTP_REQUEST_RESULT": {
"alert_emails": ["seceng-telemetry@mozilla.com"],
"expires_in_version": "never",
"kind": "enumerated",
"n_values": 16,
"description": "HTTP result of OCSP, etc.. (0=canceled, 1=OK, 2=FAILED, 3=internal-error)"
},
@@ -9416,30 +9433,36 @@
"PWMGR_BLOCKLIST_NUM_SITES": {
"expires_in_version": "never",
"kind": "exponential",
"high": 100,
"n_buckets" : 10,
"description": "The number of sites for which the user has explicitly rejected saving logins"
},
"PWMGR_FORM_AUTOFILL_RESULT": {
+ "alert_emails": ["seceng-telemetry@mozilla.com"],
+ "bug_numbers": [1340021],
+ "releaseChannelCollection": "opt-out",
"expires_in_version": "never",
"kind": "enumerated",
"n_values" : 20,
"description": "The result of auto-filling a login form. See http://mzl.la/1Mbs6jL for bucket descriptions."
},
"PWMGR_LOGIN_LAST_USED_DAYS": {
"expires_in_version": "never",
"kind": "exponential",
"high": 750,
"n_buckets" : 40,
"description": "Time in days each saved login was last used"
},
"PWMGR_LOGIN_PAGE_SAFETY": {
- "expires_in_version": "55",
+ "alert_emails": ["seceng-telemetry@mozilla.com"],
+ "bug_numbers": [1340021],
+ "releaseChannelCollection": "opt-out",
+ "expires_in_version": "never",
"kind": "enumerated",
"n_values": 8,
"description": "The safety of a page where we see a password field. (0: safe page & safe submit; 1: safe page & unsafe submit; 2: safe page & unknown submit; 3: unsafe page & safe submit; 4: unsafe page & unsafe submit; 5: unsafe page & unknown submit)"
},
"PWMGR_MANAGE_COPIED_PASSWORD": {
"expires_in_version": "never",
"kind": "count",
"description": "Count of passwords copied from the password management interface"
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -310,17 +310,16 @@
"HTTP_CONNECTION_ENTRY_CACHE_HIT_1",
"HTTP_CONTENT_ENCODING",
"HTTP_DISK_CACHE_DISPOSITION_2",
"HTTP_DISK_CACHE_OVERHEAD",
"HTTP_KBREAD_PER_CONN",
"HTTP_MEMORY_CACHE_DISPOSITION_2",
"HTTP_OFFLINE_CACHE_DISPOSITION_2",
"HTTP_OFFLINE_CACHE_DOCUMENT_LOAD",
- "HTTP_PAGELOAD_IS_SSL",
"HTTP_PAGE_CACHE_READ_TIME",
"HTTP_PAGE_CACHE_READ_TIME_V2",
"HTTP_PAGE_COMPLETE_LOAD",
"HTTP_PAGE_COMPLETE_LOAD_CACHED",
"HTTP_PAGE_COMPLETE_LOAD_CACHED_V2",
"HTTP_PAGE_COMPLETE_LOAD_NET",
"HTTP_PAGE_COMPLETE_LOAD_NET_V2",
"HTTP_PAGE_COMPLETE_LOAD_V2",
@@ -334,17 +333,16 @@
"HTTP_PAGE_REVALIDATION",
"HTTP_PAGE_TCP_CONNECTION",
"HTTP_PROXY_TYPE",
"HTTP_REQUEST_PER_CONN",
"HTTP_REQUEST_PER_PAGE",
"HTTP_REQUEST_PER_PAGE_FROM_CACHE",
"HTTP_RESPONSE_VERSION",
"HTTP_SAW_QUIC_ALT_PROTOCOL",
- "HTTP_SCHEME_UPGRADE",
"HTTP_SUBITEM_FIRST_BYTE_LATENCY_TIME",
"HTTP_SUBITEM_OPEN_LATENCY_TIME",
"HTTP_SUB_CACHE_READ_TIME",
"HTTP_SUB_CACHE_READ_TIME_V2",
"HTTP_SUB_COMPLETE_LOAD",
"HTTP_SUB_COMPLETE_LOAD_CACHED",
"HTTP_SUB_COMPLETE_LOAD_CACHED_V2",
"HTTP_SUB_COMPLETE_LOAD_NET",
@@ -354,17 +352,16 @@
"HTTP_SUB_DNS_LOOKUP_TIME",
"HTTP_SUB_FIRST_SENT_TO_LAST_RECEIVED",
"HTTP_SUB_OPEN_TO_FIRST_FROM_CACHE",
"HTTP_SUB_OPEN_TO_FIRST_FROM_CACHE_V2",
"HTTP_SUB_OPEN_TO_FIRST_RECEIVED",
"HTTP_SUB_OPEN_TO_FIRST_SENT",
"HTTP_SUB_REVALIDATION",
"HTTP_SUB_TCP_CONNECTION",
- "HTTP_TRANSACTION_IS_SSL",
"HTTP_TRANSACTION_USE_ALTSVC",
"HTTP_TRANSACTION_USE_ALTSVC_OE",
"IMAGE_DECODE_CHUNKS",
"IMAGE_DECODE_COUNT",
"IMAGE_DECODE_LATENCY_US",
"IMAGE_DECODE_ON_DRAW_LATENCY",
"IMAGE_DECODE_SPEED_GIF",
"IMAGE_DECODE_SPEED_JPEG",
@@ -562,19 +559,17 @@
"PREDICTOR_TOTAL_PRECONNECTS_UNUSED",
"PREDICTOR_TOTAL_PRECONNECTS_USED",
"PREDICTOR_TOTAL_PREDICTIONS",
"PREDICTOR_TOTAL_PRERESOLVES",
"PREDICTOR_WAIT_TIME",
"PROCESS_CRASH_SUBMIT_ATTEMPT",
"PROCESS_CRASH_SUBMIT_SUCCESS",
"PWMGR_BLOCKLIST_NUM_SITES",
- "PWMGR_FORM_AUTOFILL_RESULT",
"PWMGR_LOGIN_LAST_USED_DAYS",
- "PWMGR_LOGIN_PAGE_SAFETY",
"PWMGR_MANAGE_COPIED_PASSWORD",
"PWMGR_MANAGE_COPIED_USERNAME",
"PWMGR_MANAGE_DELETED",
"PWMGR_MANAGE_DELETED_ALL",
"PWMGR_MANAGE_OPENED",
"PWMGR_MANAGE_SORTED",
"PWMGR_MANAGE_VISIBILITY_TOGGLED",
"PWMGR_NUM_HTTPAUTH_PASSWORDS",
@@ -1099,17 +1094,16 @@
"HTTP_CONNECTION_ENTRY_CACHE_HIT_1",
"HTTP_CONTENT_ENCODING",
"HTTP_DISK_CACHE_DISPOSITION_2",
"HTTP_DISK_CACHE_OVERHEAD",
"HTTP_KBREAD_PER_CONN",
"HTTP_MEMORY_CACHE_DISPOSITION_2",
"HTTP_OFFLINE_CACHE_DISPOSITION_2",
"HTTP_OFFLINE_CACHE_DOCUMENT_LOAD",
- "HTTP_PAGELOAD_IS_SSL",
"HTTP_PAGE_CACHE_READ_TIME",
"HTTP_PAGE_CACHE_READ_TIME_V2",
"HTTP_PAGE_COMPLETE_LOAD",
"HTTP_PAGE_COMPLETE_LOAD_CACHED",
"HTTP_PAGE_COMPLETE_LOAD_CACHED_V2",
"HTTP_PAGE_COMPLETE_LOAD_NET",
"HTTP_PAGE_COMPLETE_LOAD_NET_V2",
"HTTP_PAGE_COMPLETE_LOAD_V2",
@@ -1123,17 +1117,16 @@
"HTTP_PAGE_REVALIDATION",
"HTTP_PAGE_TCP_CONNECTION",
"HTTP_PROXY_TYPE",
"HTTP_REQUEST_PER_CONN",
"HTTP_REQUEST_PER_PAGE",
"HTTP_REQUEST_PER_PAGE_FROM_CACHE",
"HTTP_RESPONSE_VERSION",
"HTTP_SAW_QUIC_ALT_PROTOCOL",
- "HTTP_SCHEME_UPGRADE",
"HTTP_SUBITEM_FIRST_BYTE_LATENCY_TIME",
"HTTP_SUBITEM_OPEN_LATENCY_TIME",
"HTTP_SUB_CACHE_READ_TIME",
"HTTP_SUB_CACHE_READ_TIME_V2",
"HTTP_SUB_COMPLETE_LOAD",
"HTTP_SUB_COMPLETE_LOAD_CACHED",
"HTTP_SUB_COMPLETE_LOAD_CACHED_V2",
"HTTP_SUB_COMPLETE_LOAD_NET",
@@ -1143,17 +1136,16 @@
"HTTP_SUB_DNS_LOOKUP_TIME",
"HTTP_SUB_FIRST_SENT_TO_LAST_RECEIVED",
"HTTP_SUB_OPEN_TO_FIRST_FROM_CACHE",
"HTTP_SUB_OPEN_TO_FIRST_FROM_CACHE_V2",
"HTTP_SUB_OPEN_TO_FIRST_RECEIVED",
"HTTP_SUB_OPEN_TO_FIRST_SENT",
"HTTP_SUB_REVALIDATION",
"HTTP_SUB_TCP_CONNECTION",
- "HTTP_TRANSACTION_IS_SSL",
"HTTP_TRANSACTION_USE_ALTSVC",
"HTTP_TRANSACTION_USE_ALTSVC_OE",
"IMAGE_DECODE_CHUNKS",
"IMAGE_DECODE_COUNT",
"IMAGE_DECODE_LATENCY_US",
"IMAGE_DECODE_ON_DRAW_LATENCY",
"IMAGE_DECODE_SPEED_GIF",
"IMAGE_DECODE_SPEED_JPEG",
@@ -1397,19 +1389,17 @@
"PUSH_API_SUBSCRIBE_HTTP2_TIME",
"PUSH_API_SUBSCRIBE_SUCCEEDED",
"PUSH_API_SUBSCRIBE_WS_TIME",
"PUSH_API_UNSUBSCRIBE_ATTEMPT",
"PUSH_API_UNSUBSCRIBE_FAILED",
"PUSH_API_UNSUBSCRIBE_SUCCEEDED",
"PUSH_API_USED",
"PWMGR_BLOCKLIST_NUM_SITES",
- "PWMGR_FORM_AUTOFILL_RESULT",
"PWMGR_LOGIN_LAST_USED_DAYS",
- "PWMGR_LOGIN_PAGE_SAFETY",
"PWMGR_MANAGE_COPIED_PASSWORD",
"PWMGR_MANAGE_COPIED_USERNAME",
"PWMGR_MANAGE_DELETED",
"PWMGR_MANAGE_DELETED_ALL",
"PWMGR_MANAGE_OPENED",
"PWMGR_MANAGE_SORTED",
"PWMGR_MANAGE_VISIBILITY_TOGGLED",
"PWMGR_NUM_HTTPAUTH_PASSWORDS",
@@ -1499,23 +1489,20 @@
"SSL_KEY_EXCHANGE_ALGORITHM_FULL",
"SSL_KEY_EXCHANGE_ALGORITHM_RESUMED",
"SSL_NPN_TYPE",
"SSL_OBSERVED_END_ENTITY_CERTIFICATE_LIFETIME",
"SSL_OCSP_MAY_FETCH",
"SSL_OCSP_STAPLING",
"SSL_PERMANENT_CERT_ERROR_OVERRIDES",
"SSL_REASONS_FOR_NOT_FALSE_STARTING",
- "SSL_RESUMED_SESSION",
"SSL_SERVER_AUTH_EKU",
"SSL_SUCCESFUL_CERT_VALIDATION_TIME_MOZILLAPKIX",
"SSL_SYMMETRIC_CIPHER_FULL",
"SSL_SYMMETRIC_CIPHER_RESUMED",
- "SSL_TIME_UNTIL_HANDSHAKE_FINISHED",
- "SSL_TIME_UNTIL_READY",
"SSL_TLS10_INTOLERANCE_REASON_POST",
"SSL_TLS10_INTOLERANCE_REASON_PRE",
"SSL_TLS11_INTOLERANCE_REASON_POST",
"SSL_TLS11_INTOLERANCE_REASON_PRE",
"SSL_TLS12_INTOLERANCE_REASON_POST",
"SSL_TLS12_INTOLERANCE_REASON_PRE",
"SSL_VERSION_FALLBACK_INAPPROPRIATE",
"STARTUP_CRASH_DETECTED",