Bug 1489524 - Extend the life of probes identified as Tier 1 for Performance and make opt-out on release. data-review=chutten r=past
authorMike Conley <mconley@mozilla.com>
Tue, 11 Sep 2018 19:45:56 +0000
changeset 435802 45e629e8498c
parent 435801 ee42ac0f515f
child 435803 34aa201bb6a8
push id34619
push userbtara@mozilla.com
push dateWed, 12 Sep 2018 03:11:51 +0000
treeherdermozilla-central@23860890d959 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspast
bugs1489524
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1489524 - Extend the life of probes identified as Tier 1 for Performance and make opt-out on release. data-review=chutten r=past Differential Revision: https://phabricator.services.mozilla.com/D5278
toolkit/components/telemetry/Histograms.json
toolkit/components/telemetry/histogram-whitelists.json
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -600,21 +600,23 @@
     "expires_in_version": "never",
     "kind": "linear",
     "high": 100,
     "n_buckets": 10,
     "description": "Requested GC slice budget (ms)"
   },
   "GC_ANIMATION_MS": {
     "record_in_processes": ["main", "content"],
-    "alert_emails": ["dev-telemetry-gc-alerts@mozilla.org"],
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 10000,
-    "n_buckets": 50,
+    "alert_emails": ["dev-telemetry-gc-alerts@mozilla.org", "jcoppeard@mozilla.com", "sdetar@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "kind": "exponential",
+    "high": 10000,
+    "n_buckets": 50,
+    "bug_numbers": [1489524],
     "description": "Time spent running JS GC when animating (ms)"
   },
   "GC_MAX_PAUSE_MS_2": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["dev-telemetry-gc-alerts@mozilla.org"],
     "bug_numbers": [1364503],
     "expires_in_version": "never",
     "kind": "exponential",
@@ -890,29 +892,31 @@
     "alert_emails": ["mds@mozilla.com"],
     "expires_in_version": "60",
     "kind": "boolean",
     "bug_numbers": [1255198],
     "description": "This metric is recorded every time a navigator.geolocation.watchPosition() request gets allowed/fulfilled. A false value is recorded if the owner is not visible according to document.isVisible."
   },
   "GPU_PROCESS_LAUNCH_TIME_MS_2" : {
     "record_in_processes": ["main", "content"],
-    "alert_emails": ["gfx-telemetry-alerts@mozilla.com", "rhunt@mozilla.com"],
-    "expires_in_version": "66",
-    "bug_numbers": [1297790, 1317796],
+    "alert_emails": ["gfx-telemetry-alerts@mozilla.com", "rhunt@mozilla.com", "dbolter@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "bug_numbers": [1297790, 1317796, 1489524],
     "kind": "exponential",
     "high": 64000,
     "n_buckets": 100,
     "description": "GPU process launch time in milliseconds"
   },
   "GPU_PROCESS_INITIALIZATION_TIME_MS" : {
     "record_in_processes": ["main", "content", "gpu"],
-    "alert_emails": ["gfx-telemetry-alerts@mozilla.com", "rhunt@mozilla.com"],
-    "expires_in_version": "66",
-    "bug_numbers": [1324095],
+    "alert_emails": ["gfx-telemetry-alerts@mozilla.com", "rhunt@mozilla.com", "dbolter@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "bug_numbers": [1324095, 1489524],
     "kind": "exponential",
     "high": 64000,
     "n_buckets": 100,
     "description": "GPU process initialization (excluding XPCOM and fork time) time in milliseconds"
   },
   "GPU_PROCESS_CRASH_FALLBACKS": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["gfx-telemetry-alerts@mozilla.com", "cpearce@mozilla.com", "gsquelart@mozilla.com"],
@@ -5192,22 +5196,25 @@
     "expires_in_version": "never",
     "kind": "exponential",
     "low": 50,
     "high": 500,
     "n_buckets": 10,
     "description": "PLACES: Time for first autocomplete result if > 50ms (ms)"
   },
   "PLACES_AUTOCOMPLETE_6_FIRST_RESULTS_TIME_MS": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["mdeboer@mozilla.com", "dolske@mozilla.com"],
+    "releaseChannelCollection": "opt-out",
     "expires_in_version": "never",
     "kind": "exponential",
     "low": 50,
     "high": 1000,
     "n_buckets": 30,
+    "bug_numbers": [1489524],
     "description": "PLACES: Time for the 6 first autocomplete results (ms)"
   },
   "HISTORY_LASTVISITED_TREE_QUERY_TIME_MS": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "exponential",
     "low": 50,
     "high": 2000,
@@ -5822,32 +5829,34 @@
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 50,
     "bug_numbers": [1228147],
     "description": "Delay in ms between the target and the actual handling time of the frame at refresh driver while scrolling synchronously."
   },
   "FX_TAB_SWITCH_UPDATE_MS": {
-    "record_in_processes": ["main", "content"],
-    "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["perf-telemetry-alerts@mozilla.com", "mconley@mozilla.com", "dolske@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "kind": "exponential",
+    "high": 1000,
+    "n_buckets": 20,
+    "bug_numbers": [1489524],
+    "description": "Firefox: Time in ms spent updating UI in response to a tab switch"
+  },
+  "FX_TAB_SWITCH_TOTAL_E10S_MS": {
+    "record_in_processes": ["main"],
+    "alert_emails": ["mconley@mozilla.com", "dolske@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 20,
-    "description": "Firefox: Time in ms spent updating UI in response to a tab switch"
-  },
-  "FX_TAB_SWITCH_TOTAL_E10S_MS": {
-    "record_in_processes": ["main"],
-    "alert_emails": ["mconley@mozilla.com"],
-    "expires_in_version": "70",
-    "kind": "exponential",
-    "high": 1000,
-    "n_buckets": 20,
-    "bug_numbers": [1156592],
+    "bug_numbers": [1156592, 1489524],
     "releaseChannelCollection": "opt-out",
     "description": "Firefox: Time in ms between tab selection and tab content paint in e10s windows"
   },
   "FX_TAB_SWITCH_COMPOSITE_E10S_MS": {
     "record_in_processes": ["main"],
     "alert_emails": ["mwoodrow@mozilla.com"],
     "expires_in_version": "70",
     "kind": "exponential",
@@ -5935,23 +5944,24 @@
   },
   "FX_BROWSER_FULLSCREEN_USED": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "46",
     "kind": "count",
     "description": "The number of times that a session enters browser fullscreen (f11-fullscreen)"
   },
   "FX_NEW_WINDOW_MS": {
-    "record_in_processes": ["main", "content"],
-    "expires_in_version": "default",
-    "alert_emails": ["mconley@mozilla.com", "hkirschner@mozilla.com", "sphilp@mozilla.com"],
-    "releaseChannelCollection": "opt-out",
-    "kind": "exponential",
-    "high": 10000,
-    "n_buckets": 20,
+    "record_in_processes": ["main"],
+    "expires_in_version": "never",
+    "alert_emails": ["mconley@mozilla.com", "dolske@mozilla.com"],
+    "releaseChannelCollection": "opt-out",
+    "kind": "exponential",
+    "high": 10000,
+    "n_buckets": 20,
+    "bug_numbers": [1489524],
     "description": "Firefox: Time taken to open a new browser window (ms)"
   },
   "FX_PAGE_LOAD_MS": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "default",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 20,
@@ -6399,19 +6409,19 @@
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 50,
     "description": "Time (ms) from the Input event being created to the end of it being handled"
   },
   "INPUT_EVENT_RESPONSE_COALESCED_MS": {
     "record_in_processes": ["main", "content"],
-    "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "bug_numbers": [1357457],
-    "expires_in_version": "61",
+    "alert_emails": ["perf-telemetry-alerts@mozilla.com", "chutten@mozilla.com", "gfritzsche@mozilla.com"],
+    "bug_numbers": [1357457, 1489524],
+    "expires_in_version": "never",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 50,
     "releaseChannelCollection": "opt-out",
     "description": "Time (ms) from the Input event being created to the end of it being handled, but with overlapping events coalesced."
   },
   "INPUT_EVENT_RESPONSE_STARTUP_MS": {
     "record_in_processes": ["main", "content"],
@@ -6451,31 +6461,35 @@
     "bug_numbers": [1198196],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 60000,
     "n_buckets": 50,
     "description": "Widget: Time it takes for the message before a UI message (ms)"
   },
   "FX_SESSION_RESTORE_STARTUP_INIT_SESSION_MS": {
-    "record_in_processes": ["main", "content"],
-    "alert_emails": ["session-restore-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "default",
+    "record_in_processes": ["main"],
+    "alert_emails": ["session-restore-telemetry-alerts@mozilla.com", "mdeboer@mozilla.com", "dolske@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 30000,
     "n_buckets": 20,
+    "bug_numbers": [1489524],
     "description": "Session restore: Time it takes to prepare the data structures for restoring a session (ms)"
   },
   "FX_SESSION_RESTORE_STARTUP_ONLOAD_INITIAL_WINDOW_MS": {
-    "record_in_processes": ["main", "content"],
-    "alert_emails": ["session-restore-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "record_in_processes": ["main"],
+    "alert_emails": ["session-restore-telemetry-alerts@mozilla.com", "mdeboer@mozilla.com", "dolske@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 30000,
     "n_buckets": 20,
+    "bug_numbers": [1489524],
     "description": "Session restore: Time it takes to finish restoration once we have first opened a window (ms)"
   },
   "FX_SESSION_RESTORE_COLLECT_ALL_WINDOWS_DATA_MS": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["session-restore-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 30000,
@@ -6557,22 +6571,24 @@
   "FX_SESSION_RESTORE_ALL_FILES_CORRUPT": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["session-restore-telemetry-alerts@mozilla.com"],
     "expires_in_version": "default",
     "kind": "boolean",
     "description": "Session restore: Whether none of the backup files contained parse-able JSON"
   },
   "FX_SESSION_RESTORE_RESTORE_WINDOW_MS": {
-    "record_in_processes": ["main", "content"],
-    "alert_emails": ["session-restore-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "default",
+    "record_in_processes": ["main"],
+    "alert_emails": ["session-restore-telemetry-alerts@mozilla.com", "mdeboer@mozilla.com", "dolske@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 3000,
     "n_buckets": 10,
+    "bug_numbers": [1489524],
     "description": "Session restore: Time spent blocking the main thread while restoring a window state (ms)"
   },
   "FX_SESSION_RESTORE_SEND_UPDATE_CAUSED_OOM": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["session-restore-telemetry-alerts@mozilla.com"],
     "expires_in_version": "default",
     "kind": "count",
     "description": "Count of messages sent by SessionRestore from child frames to the parent and that cannot be transmitted as they eat up too much memory."
@@ -7921,21 +7937,24 @@
     "bug_numbers": [1203168],
     "expires_in_version": "65",
     "kind": "enumerated",
     "n_values": 5,
     "releaseChannelCollection": "opt-out",
     "description": "Result of showing the search reset prompt to the user. 0=restored original default, 1=kept current engine, 2=changed engine, 3=closed the page, 4=opened search settings"
   },
   "SEARCH_SERVICE_INIT_MS": {
-    "record_in_processes": ["main", "content"],
-    "expires_in_version": "never",
+    "record_in_processes": ["main"],
+    "alert_emails": ["mdeboer@mozilla.com", "dolske@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 15,
+    "bug_numbers": [1489524],
     "description": "Time (ms) it takes to initialize the search service"
   },
   "SEARCH_SERVICE_INIT_SYNC": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["rvitillo@mozilla.com", "gavin@mozilla.com"],
     "expires_in_version": "never",
     "kind": "boolean",
     "description": "search service has been initialized synchronously"
@@ -10456,28 +10475,34 @@
     "expires_in_version": "default",
     "kind": "exponential",
     "high": 500,
     "n_buckets": 15,
     "description": "BACKGROUND THUMBNAILS: Time it took to draw the capture's window to canvas (ms)"
   },
   "NETWORK_CACHE_V2_MISS_TIME_MS": {
     "record_in_processes": ["main", "content"],
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 10000,
-    "n_buckets": 50,
+    "alert_emails": ["hbambas@mozilla.com", "mnovotny@mozilla.com", "jduell@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "kind": "exponential",
+    "high": 10000,
+    "n_buckets": 50,
+    "bug_numbers": [1489524],
     "description": "Time spent to find out a cache entry file is missing"
   },
   "NETWORK_CACHE_V2_HIT_TIME_MS": {
     "record_in_processes": ["main", "content"],
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 10000,
-    "n_buckets": 50,
+    "alert_emails": ["hbambas@mozilla.com", "mnovotny@mozilla.com", "jduell@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "kind": "exponential",
+    "high": 10000,
+    "n_buckets": 50,
+    "bug_numbers": [1489524],
     "description": "Time spent to open an existing file"
   },
   "NETWORK_CACHE_V1_TRUNCATE_TIME_MS": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 50,
@@ -12878,29 +12903,31 @@
     "expires_in_version": "58",
     "kind": "exponential",
     "high": 50000,
     "n_buckets": 100,
     "description": "Time in milliseconds from the first non-blank paint to the creation time of the next scroll event per top-level content browsing context."
   },
   "TIME_TO_FIRST_INTERACTION_MS": {
     "record_in_processes": ["main", "content"],
-    "alert_emails": ["hkirschner@mozilla.com"],
-    "bug_numbers": [1332511],
-    "expires_in_version": "58",
+    "alert_emails": ["hkirschner@mozilla.com", "vchin@mozilla.com", "sphilp@mozilla.com", "dstrohmeier@mozilla.com"],
+    "bug_numbers": [1332511, 1489524],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 50000,
     "n_buckets": 100,
     "description": "Time in milliseconds from the first non-blank paint to the creation time of the next click, key, mouse or scroll event per top-level content browsing context."
   },
   "CONTENT_PAINT_TIME": {
     "record_in_processes": ["main", "content"],
-    "alert_emails": ["gfx-telemetry-alerts@mozilla.com", "mwoodrow@mozilla.com"],
-    "bug_numbers": [1309442],
-    "expires_in_version": "66",
+    "alert_emails": ["gfx-telemetry-alerts@mozilla.com", "mwoodrow@mozilla.com", "dbolter@mozilla.com"],
+    "bug_numbers": [1309442, 1489524],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 50,
     "description": "Time spent in the paint pipeline for content in milliseconds."
   },
   "CONTENT_FRAME_TIME": {
     "record_in_processes": ["main", "gpu"],
     "alert_emails": ["gfx-telemetry-alerts@mozilla.com", "rhunt@mozilla.com"],
@@ -12965,22 +12992,23 @@
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 50,
     "description": "Time spent painting the contents of a remote browser (ms).",
     "releaseChannelCollection": "opt-out"
   },
   "TIME_TO_NON_BLANK_PAINT_MS": {
     "record_in_processes": ["main", "content"],
-    "alert_emails": ["hkirschner@mozilla.com"],
-    "expires_in_version": "60",
+    "alert_emails": ["hkirschner@mozilla.com", "vchin@mozilla.com", "sphilp@mozilla.com", "dstrohmeier@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 100000,
     "n_buckets": 100,
-    "bug_numbers": [1307242],
+    "bug_numbers": [1307242, 1489524],
     "description": "The time between navigation start and the first non-blank paint of a foreground root content document, in milliseconds. This only records documents that were in an active docshell throughout the whole time between navigation start and non-blank paint. The non-blank paint timestamp is taken during display list building and does not include rasterization or compositing of that paint."
   },
   "TIME_TO_NON_BLANK_PAINT_NETOPT_MS": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["necko@mozilla.com", "hbambas@mozilla.com"],
     "expires_in_version": "63",
     "kind": "exponential",
     "high": 100000,
@@ -13174,32 +13202,34 @@
     "kind": "exponential",
     "low": 1,
     "high": 1000,
     "n_buckets": 10,
     "description": "Time in ms used to execute callbacks from setTimeout/setInterval, when the script belongs to a tab in the background and the script is on the tracking list. Multiple events are aggregated over a 1s interval."
   },
   "TIME_TO_DOM_LOADING_MS": {
     "record_in_processes": ["content"],
-    "alert_emails": ["wpan@mozilla.com"],
-    "expires_in_version": "60",
+    "alert_emails": ["hbambas@mozilla.com", "vgosu@mozilla.com", "jduell@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 50000,
     "n_buckets": 100,
-    "bug_numbers": [1344893],
+    "bug_numbers": [1344893, 1489524],
     "description": "Time in milliseconds from navigationStart to domLoading."
   },
   "TIME_TO_DOM_INTERACTIVE_MS": {
     "record_in_processes": ["content"],
-    "alert_emails": ["wpan@mozilla.com"],
-    "expires_in_version": "60",
+    "alert_emails": ["hbambas@mozilla.com", "vgosu@mozilla.com", "jduell@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 50000,
     "n_buckets": 100,
-    "bug_numbers": [1344893],
+    "bug_numbers": [1344893, 1489524],
     "description": "Time in milliseconds from navigationStart to domInteractive."
   },
   "TIME_TO_DOM_CONTENT_LOADED_START_MS": {
     "record_in_processes": ["content"],
     "alert_emails": ["wpan@mozilla.com"],
     "expires_in_version": "60",
     "kind": "exponential",
     "high": 50000,
@@ -13224,32 +13254,34 @@
     "kind": "exponential",
     "high": 50000,
     "n_buckets": 100,
     "bug_numbers": [1411632],
     "description": "Time in milliseconds from navigationStart to domContentLoadedEventStart for all-the-time active page for which none of the network loading optimization happened."
   },
   "TIME_TO_DOM_CONTENT_LOADED_END_MS": {
     "record_in_processes": ["content"],
-    "alert_emails": ["wpan@mozilla.com"],
-    "expires_in_version": "60",
+    "alert_emails": ["hkirschner@mozilla.com", "vchin@mozilla.com", "sphilp@mozilla.com", "dstrohmeier@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 50000,
     "n_buckets": 100,
-    "bug_numbers": [1344893],
+    "bug_numbers": [1344893, 1489524],
     "description": "Time in milliseconds from navigationStart to domContentLoadedEventEnd."
   },
   "TIME_TO_DOM_COMPLETE_MS": {
     "record_in_processes": ["content"],
-    "alert_emails": ["wpan@mozilla.com"],
-    "expires_in_version": "60",
+    "alert_emails": ["hbambas@mozilla.com", "vgosu@mozilla.com", "jduell@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 50000,
     "n_buckets": 100,
-    "bug_numbers": [1344893],
+    "bug_numbers": [1344893, 1489524],
     "description": "Time in milliseconds from navigationStart to domComplete."
   },
   "TIME_TO_LOAD_EVENT_START_MS": {
     "record_in_processes": ["content"],
     "alert_emails": ["wpan@mozilla.com"],
     "expires_in_version": "60",
     "kind": "exponential",
     "high": 50000,
@@ -13274,32 +13306,34 @@
     "kind": "exponential",
     "high": 50000,
     "n_buckets": 100,
     "bug_numbers": [1411632],
     "description": "Time in milliseconds from navigationStart to loadEventStart for all-the-time active page for which none of the network loading optimization happened."
   },
   "TIME_TO_LOAD_EVENT_END_MS": {
     "record_in_processes": ["content"],
-    "alert_emails": ["wpan@mozilla.com"],
-    "expires_in_version": "60",
+    "alert_emails": ["hkirschner@mozilla.com", "vchin@mozilla.com", "sphilp@mozilla.com", "dstrohmeier@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 50000,
     "n_buckets": 100,
-    "bug_numbers": [1344893],
+    "bug_numbers": [1344893, 1489524],
     "description": "Time in milliseconds from navigationStart to loadEventEnd."
   },
   "TIME_TO_RESPONSE_START_MS": {
     "record_in_processes": ["main", "content"],
-    "alert_emails": ["wpan@mozilla.com"],
-    "expires_in_version": "60",
+    "alert_emails": ["hkirschner@mozilla.com", "vchin@mozilla.com", "sphilp@mozilla.com", "dstrohmeier@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
     "kind": "exponential",
     "high": 50000,
     "n_buckets": 100,
-    "bug_numbers": [1344893],
+    "bug_numbers": [1344893, 1489524],
     "description": "Time in milliseconds from navigationStart to responseStart."
   },
   "INPUT_EVENT_HANDLED_MOUSE_UP_MS": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["wpan@mozilla.com"],
     "expires_in_version": "60",
     "kind": "exponential",
     "high": 5000,
@@ -13443,19 +13477,19 @@
     "low": 32,
     "high": 750,
     "n_buckets": 40,
     "keyed": true,
     "description": "Measures the number of milliseconds we spend processing sync IPC messages in the receiving process, keyed by message name. Note: only messages that take over 500 microseconds are included in this probe."
   },
   "WEBEXT_BACKGROUND_PAGE_LOAD_MS": {
     "record_in_processes": ["main"],
-    "alert_emails": ["addons-dev-internal@mozilla.com"],
-    "bug_numbers": [1353172],
-    "expires_in_version": "67",
+    "alert_emails": ["addons-dev-internal@mozilla.com", "ddurst@mozilla.com", "ckarlof@mozilla.com"],
+    "bug_numbers": [1353172, 1489524],
+    "expires_in_version": "never",
     "kind": "exponential",
     "releaseChannelCollection": "opt-out",
     "high": 60000,
     "n_buckets": 100,
     "description": "The amount of time it takes to load a WebExtensions background page, from when the build function is called to when the page has finished processing the onload event."
   },
   "WEBEXT_BACKGROUND_PAGE_LOAD_MS_BY_ADDONID": {
     "record_in_processes": ["main"],
@@ -13510,19 +13544,19 @@
     "kind": "categorical",
     "labels": ["popupShown", "clearAfterHover", "clearAfterMousedown"],
     "releaseChannelCollection": "opt-out",
     "description": "The number of times a browserAction popup is preloaded and results in one of the categories, keyed by addon id.",
     "keyed": true
   },
   "WEBEXT_CONTENT_SCRIPT_INJECTION_MS": {
     "record_in_processes": ["main", "content"],
-    "alert_emails": ["addons-dev-internal@mozilla.com"],
-    "bug_numbers": [1356323],
-    "expires_in_version": "67",
+    "alert_emails": ["addons-dev-internal@mozilla.com", "ddurst@mozilla.com", "ckarlof@mozilla.com"],
+    "bug_numbers": [1356323, 1489524],
+    "expires_in_version": "never",
     "kind": "exponential",
     "releaseChannelCollection": "opt-out",
     "high": 50000,
     "n_buckets": 100,
     "description": "The amount of time it takes for content scripts from a WebExtension to be injected into a window."
   },
   "WEBEXT_CONTENT_SCRIPT_INJECTION_MS_BY_ADDONID": {
     "record_in_processes": ["main", "content"],
@@ -13533,19 +13567,19 @@
     "releaseChannelCollection": "opt-out",
     "high": 50000,
     "n_buckets": 100,
     "description": "The amount of time it takes for content scripts from a WebExtension to be injected into a window, keyed by addon id.",
     "keyed": true
   },
   "WEBEXT_EXTENSION_STARTUP_MS": {
     "record_in_processes": ["main"],
-    "alert_emails": ["addons-dev-internal@mozilla.com"],
-    "bug_numbers": [1353171],
-    "expires_in_version": "67",
+    "alert_emails": ["addons-dev-internal@mozilla.com", "ddurst@mozilla.com", "ckarlof@mozilla.com"],
+    "bug_numbers": [1353171, 1489524],
+    "expires_in_version": "never",
     "kind": "exponential",
     "releaseChannelCollection": "opt-out",
     "high": 50000,
     "n_buckets": 100,
     "description": "The amount of time it takes for a WebExtension to start up, from when the startup function is called to when the startup promise resolves."
   },
    "WEBEXT_EXTENSION_STARTUP_MS_BY_ADDONID": {
     "record_in_processes": ["main"],
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -296,19 +296,17 @@
     "NETWORK_CACHE_METADATA_FIRST_READ_SIZE",
     "NETWORK_CACHE_METADATA_FIRST_READ_TIME_MS",
     "NETWORK_CACHE_METADATA_SECOND_READ_TIME_MS",
     "NETWORK_CACHE_METADATA_SIZE",
     "NETWORK_CACHE_SIZE_FULL_FAT",
     "NETWORK_CACHE_V1_HIT_TIME_MS",
     "NETWORK_CACHE_V1_MISS_TIME_MS",
     "NETWORK_CACHE_V1_TRUNCATE_TIME_MS",
-    "NETWORK_CACHE_V2_HIT_TIME_MS",
     "NETWORK_CACHE_V2_INPUT_STREAM_STATUS",
-    "NETWORK_CACHE_V2_MISS_TIME_MS",
     "NETWORK_CACHE_V2_OUTPUT_STREAM_STATUS",
     "NETWORK_DISK_CACHE2_SHUTDOWN_CLEAR_PRIVATE",
     "NETWORK_DISK_CACHE_DELETEDIR",
     "NETWORK_DISK_CACHE_DELETEDIR_SHUTDOWN",
     "NETWORK_DISK_CACHE_OPEN",
     "NETWORK_DISK_CACHE_SHUTDOWN",
     "NETWORK_DISK_CACHE_SHUTDOWN_CLEAR_PRIVATE",
     "NETWORK_DISK_CACHE_SHUTDOWN_V2",
@@ -334,17 +332,16 @@
     "PDF_VIEWER_PRINT",
     "PDF_VIEWER_STREAM_TYPES",
     "PDF_VIEWER_TIME_TO_VIEW_MS",
     "PDF_VIEWER_USED",
     "PERMISSIONS_SQL_CORRUPTED",
     "PLACES_ANNOS_BOOKMARKS_COUNT",
     "PLACES_ANNOS_PAGES_COUNT",
     "PLACES_AUTOCOMPLETE_1ST_RESULT_TIME_MS",
-    "PLACES_AUTOCOMPLETE_6_FIRST_RESULTS_TIME_MS",
     "PLACES_AUTOCOMPLETE_URLINLINE_DOMAIN_QUERY_TIME_MS",
     "PLACES_BACKUPS_BOOKMARKSTREE_MS",
     "PLACES_BACKUPS_DAYSFROMLAST",
     "PLACES_BACKUPS_TOJSON_MS",
     "PLACES_BOOKMARKS_COUNT",
     "PLACES_DATABASE_FILESIZE_MB",
     "PLACES_DATABASE_PAGESIZE_B",
     "PLACES_DATABASE_SIZE_PER_PAGE_B",
@@ -396,17 +393,16 @@
     "PWMGR_MANAGE_DELETED_ALL",
     "PWMGR_MANAGE_SORTED",
     "PWMGR_NUM_HTTPAUTH_PASSWORDS",
     "PWMGR_PASSWORD_INPUT_IN_FORM",
     "PWMGR_USERNAME_PRESENT",
     "REQUESTS_OF_ORIGINAL_CONTENT",
     "SAFE_MODE_USAGE",
     "SEARCH_COUNTS",
-    "SEARCH_SERVICE_INIT_MS",
     "SERVICE_WORKER_CONTROLLED_DOCUMENTS",
     "SERVICE_WORKER_LIFE_TIME",
     "SERVICE_WORKER_REGISTRATIONS",
     "SERVICE_WORKER_REGISTRATION_LOADING",
     "SERVICE_WORKER_REQUEST_PASSTHROUGH",
     "SERVICE_WORKER_SPAWN_ATTEMPTS",
     "SERVICE_WORKER_UPDATED",
     "SERVICE_WORKER_WAS_SPAWNED",
@@ -670,17 +666,16 @@
     "FONTLIST_INITOTHERFAMILYNAMES",
     "FONTLIST_INITOTHERFAMILYNAMES_NO_DEFERRING",
     "FONT_CACHE_HIT",
     "FORGET_SKIPPABLE_MAX",
     "FX_BOOKMARKS_TOOLBAR_INIT_MS",
     "FX_BROWSER_FULLSCREEN_USED",
     "FX_GESTURE_COMPRESS_SNAPSHOT_OF_PAGE",
     "FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE",
-    "FX_NEW_WINDOW_MS",
     "FX_PAGE_LOAD_MS",
     "FX_SANITIZE_CACHE",
     "FX_SANITIZE_COOKIES_2",
     "FX_SANITIZE_DOWNLOADS",
     "FX_SANITIZE_FORMDATA",
     "FX_SANITIZE_HISTORY",
     "FX_SANITIZE_OPENWINDOWS",
     "FX_SANITIZE_SESSIONS",
@@ -692,37 +687,32 @@
     "FX_SESSION_RESTORE_COLLECT_DATA_MS",
     "FX_SESSION_RESTORE_CORRUPT_FILE",
     "FX_SESSION_RESTORE_FILE_SIZE_BYTES",
     "FX_SESSION_RESTORE_MANUAL_RESTORE_DURATION_UNTIL_EAGER_TABS_RESTORED_MS",
     "FX_SESSION_RESTORE_NUMBER_OF_EAGER_TABS_RESTORED",
     "FX_SESSION_RESTORE_NUMBER_OF_TABS_RESTORED",
     "FX_SESSION_RESTORE_NUMBER_OF_WINDOWS_RESTORED",
     "FX_SESSION_RESTORE_READ_FILE_MS",
-    "FX_SESSION_RESTORE_RESTORE_WINDOW_MS",
     "FX_SESSION_RESTORE_SEND_UPDATE_CAUSED_OOM",
     "FX_SESSION_RESTORE_SERIALIZE_DATA_MS",
-    "FX_SESSION_RESTORE_STARTUP_INIT_SESSION_MS",
-    "FX_SESSION_RESTORE_STARTUP_ONLOAD_INITIAL_WINDOW_MS",
     "FX_SESSION_RESTORE_WRITE_FILE_MS",
     "FX_TABLETMODE_PAGE_LOAD",
     "FX_TAB_CLICK_MS",
-    "FX_TAB_SWITCH_UPDATE_MS",
     "FX_THUMBNAILS_BG_CAPTURE_CANVAS_DRAW_TIME_MS",
     "FX_THUMBNAILS_BG_CAPTURE_DONE_REASON_2",
     "FX_THUMBNAILS_BG_CAPTURE_PAGE_LOAD_TIME_MS",
     "FX_THUMBNAILS_BG_CAPTURE_QUEUE_TIME_MS",
     "FX_THUMBNAILS_BG_CAPTURE_SERVICE_TIME_MS",
     "FX_THUMBNAILS_BG_QUEUE_SIZE_ON_CAPTURE",
     "FX_THUMBNAILS_CAPTURE_TIME_MS",
     "FX_THUMBNAILS_HIT_OR_MISS",
     "FX_THUMBNAILS_STORE_TIME_MS",
     "FX_TOTAL_TOP_VISITS",
     "FX_TOUCH_USED",
-    "GC_ANIMATION_MS",
     "GC_BUDGET_MS",
     "GC_COMPACT_MS",
     "GC_INCREMENTAL_DISABLED",
     "GC_IS_COMPARTMENTAL",
     "GC_MARK_GRAY_MS",
     "GC_MARK_MS",
     "GC_MARK_ROOTS_MS",
     "GC_MINOR_REASON",
@@ -880,19 +870,17 @@
     "NETWORK_CACHE_METADATA_FIRST_READ_SIZE",
     "NETWORK_CACHE_METADATA_FIRST_READ_TIME_MS",
     "NETWORK_CACHE_METADATA_SECOND_READ_TIME_MS",
     "NETWORK_CACHE_METADATA_SIZE",
     "NETWORK_CACHE_SIZE_FULL_FAT",
     "NETWORK_CACHE_V1_HIT_TIME_MS",
     "NETWORK_CACHE_V1_MISS_TIME_MS",
     "NETWORK_CACHE_V1_TRUNCATE_TIME_MS",
-    "NETWORK_CACHE_V2_HIT_TIME_MS",
     "NETWORK_CACHE_V2_INPUT_STREAM_STATUS",
-    "NETWORK_CACHE_V2_MISS_TIME_MS",
     "NETWORK_CACHE_V2_OUTPUT_STREAM_STATUS",
     "NETWORK_DISK_CACHE2_SHUTDOWN_CLEAR_PRIVATE",
     "NETWORK_DISK_CACHE_DELETEDIR",
     "NETWORK_DISK_CACHE_DELETEDIR_SHUTDOWN",
     "NETWORK_DISK_CACHE_OPEN",
     "NETWORK_DISK_CACHE_SHUTDOWN",
     "NETWORK_DISK_CACHE_SHUTDOWN_CLEAR_PRIVATE",
     "NETWORK_DISK_CACHE_SHUTDOWN_V2",
@@ -923,17 +911,16 @@
     "PDF_VIEWER_USED",
     "PERF_MONITORING_TEST_CPU_RESCHEDULING_PROPORTION_MOVED",
     "PERMISSIONS_MIGRATION_7_ERROR",
     "PERMISSIONS_REMIGRATION_COMPARISON",
     "PERMISSIONS_SQL_CORRUPTED",
     "PLACES_ANNOS_BOOKMARKS_COUNT",
     "PLACES_ANNOS_PAGES_COUNT",
     "PLACES_AUTOCOMPLETE_1ST_RESULT_TIME_MS",
-    "PLACES_AUTOCOMPLETE_6_FIRST_RESULTS_TIME_MS",
     "PLACES_AUTOCOMPLETE_URLINLINE_DOMAIN_QUERY_TIME_MS",
     "PLACES_BACKUPS_BOOKMARKSTREE_MS",
     "PLACES_BACKUPS_DAYSFROMLAST",
     "PLACES_BACKUPS_TOJSON_MS",
     "PLACES_BOOKMARKS_COUNT",
     "PLACES_DATABASE_FILESIZE_MB",
     "PLACES_DATABASE_PAGESIZE_B",
     "PLACES_DATABASE_SIZE_PER_PAGE_B",
@@ -996,17 +983,16 @@
     "REFRESH_DRIVER_TICK",
     "REQUESTS_OF_ORIGINAL_CONTENT",
     "SAFE_MODE_USAGE",
     "SEARCH_COUNTS",
     "SEARCH_SERVICE_COUNTRY_FETCH_CAUSED_SYNC_INIT",
     "SEARCH_SERVICE_COUNTRY_FETCH_RESULT",
     "SEARCH_SERVICE_COUNTRY_FETCH_TIME_MS",
     "SEARCH_SERVICE_COUNTRY_TIMEOUT",
-    "SEARCH_SERVICE_INIT_MS",
     "SEARCH_SERVICE_INIT_SYNC",
     "SEARCH_SERVICE_NONUS_COUNTRY_MISMATCHED_PLATFORM_OSX",
     "SEARCH_SERVICE_NONUS_COUNTRY_MISMATCHED_PLATFORM_WIN",
     "SEARCH_SERVICE_US_COUNTRY_MISMATCHED_PLATFORM_OSX",
     "SEARCH_SERVICE_US_COUNTRY_MISMATCHED_PLATFORM_WIN",
     "SEARCH_SERVICE_US_COUNTRY_MISMATCHED_TIMEZONE",
     "SEARCH_SERVICE_US_TIMEZONE_MISMATCHED_COUNTRY",
     "SERVICE_WORKER_CONTROLLED_DOCUMENTS",
@@ -1393,25 +1379,23 @@
     "CACHE_DISK_SEARCH_2",
     "FX_THUMBNAILS_BG_CAPTURE_QUEUE_TIME_MS",
     "NEWTAB_PAGE_PINNED_SITES_COUNT",
     "WEAVE_COMPLETE_SUCCESS_COUNT",
     "OSFILE_WRITEATOMIC_JANK_MS",
     "STARTUP_MEASUREMENT_ERRORS",
     "CERT_CHAIN_KEY_SIZE_STATUS",
     "CHANGES_OF_TARGET_LANGUAGE",
-    "FX_NEW_WINDOW_MS",
     "PDF_VIEWER_TIME_TO_VIEW_MS",
     "SSL_OCSP_MAY_FETCH",
     "MOZ_SQLITE_OTHER_READ_B",
     "TRANSLATION_OPPORTUNITIES",
     "NEWTAB_PAGE_BLOCKED_SITES_COUNT",
     "FX_SESSION_RESTORE_NUMBER_OF_TABS_RESTORED",
     "WEAVE_START_COUNT",
-    "FX_SESSION_RESTORE_RESTORE_WINDOW_MS",
     "HTTP_DISK_CACHE_OVERHEAD",
     "FX_SESSION_RESTORE_CORRUPT_FILE",
     "FX_TAB_CLICK_MS",
     "LOCALDOMSTORAGE_GETVALUE_BLOCKING_MS",
     "PDF_VIEWER_DOCUMENT_VERSION",
     "GEOLOCATION_ACCURACY_EXPONENTIAL",
     "FX_SESSION_RESTORE_READ_FILE_MS",
     "CHANGES_OF_DETECTED_LANGUAGE",
@@ -1423,17 +1407,16 @@
     "DATA_STORAGE_ENTRIES",
     "TRANSLATED_PAGES_BY_LANGUAGE",
     "MOZ_SQLITE_OTHER_WRITE_B",
     "LOCALDOMSTORAGE_SHUTDOWN_DATABASE_MS",
     "SSL_CERT_VERIFICATION_ERRORS",
     "FX_SESSION_RESTORE_NUMBER_OF_WINDOWS_RESTORED",
     "MOZ_SQLITE_PLACES_WRITE_MS",
     "FX_THUMBNAILS_BG_CAPTURE_CANVAS_DRAW_TIME_MS",
-    "FX_SESSION_RESTORE_STARTUP_INIT_SESSION_MS",
     "FX_SESSION_RESTORE_WRITE_FILE_MS",
     "FX_THUMBNAILS_BG_CAPTURE_PAGE_LOAD_TIME_MS",
     "REQUESTS_OF_ORIGINAL_CONTENT",
     "NEWTAB_PAGE_ENHANCED",
     "CERT_CHAIN_SHA1_POLICY_STATUS",
     "PDF_VIEWER_DOCUMENT_SIZE_KB",
     "FX_THUMBNAILS_BG_CAPTURE_SERVICE_TIME_MS",
     "PLACES_BACKUPS_TOJSON_MS",