Issue #21 - Remove TelemertyVFS

This reverts m-c Bug 668378 and completely removes Telemetry SQLite IO. As a bonus this fixes a potential crash in newer SQLite versions without the need for updating this useless telemetry shim.

2 files changed, 0 insertions, 337 deletions

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index f61a67efc..2d90166a6 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3704,265 +3704,6 @@
     "n_values": 30,
     "description": "Flash object instances count on page"
   },
-  "MOZ_SQLITE_OPEN_MS": {
-    "expires_in_version": "default",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite open() (ms)"
-  },
-  "MOZ_SQLITE_OPEN_MAIN_THREAD_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite open() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_TRUNCATE_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite truncate() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_TRUNCATE_MAIN_THREAD_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite truncate() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_OTHER_READ_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_OTHER_READ_MAIN_THREAD_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_PLACES_READ_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_PLACES_READ_MAIN_THREAD_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_COOKIES_OPEN_READAHEAD_MS": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on cookie DB open with readahead (ms)"
-  },
-  "MOZ_SQLITE_COOKIES_READ_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_COOKIES_READ_MAIN_THREAD_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_WEBAPPS_READ_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_WEBAPPS_READ_MAIN_THREAD_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_OTHER_WRITE_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_OTHER_WRITE_MAIN_THREAD_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_PLACES_WRITE_MS": {
-    "expires_in_version": "default",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite write() (ms)"
-  },
-  "MOZ_SQLITE_PLACES_WRITE_MAIN_THREAD_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_COOKIES_WRITE_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_COOKIES_WRITE_MAIN_THREAD_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_WEBAPPS_WRITE_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_WEBAPPS_WRITE_MAIN_THREAD_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_OTHER_SYNC_MS": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite fsync() (ms)"
-  },
-  "MOZ_SQLITE_OTHER_SYNC_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite fsync() (ms)"
-  },
-  "MOZ_SQLITE_PLACES_SYNC_MS": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite fsync() (ms)"
-  },
-  "MOZ_SQLITE_PLACES_SYNC_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite fsync() (ms)"
-  },
-  "MOZ_SQLITE_COOKIES_SYNC_MS": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite fsync() (ms)"
-  },
-  "MOZ_SQLITE_COOKIES_SYNC_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite fsync() (ms)"
-  },
-  "MOZ_SQLITE_WEBAPPS_SYNC_MS": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite fsync() (ms)"
-  },
-  "MOZ_SQLITE_WEBAPPS_SYNC_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent on SQLite fsync() (ms)"
-  },
-  "MOZ_SQLITE_OTHER_READ_B": {
-    "expires_in_version": "default",
-    "kind": "linear",
-    "high": 32768,
-    "n_buckets": 3,
-    "description": "SQLite read() (bytes)"
-  },
-  "MOZ_SQLITE_PLACES_READ_B": {
-    "expires_in_version": "40",
-    "kind": "linear",
-    "high": 32768,
-    "n_buckets": 3,
-    "description": "SQLite read() (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_COOKIES_READ_B": {
-    "expires_in_version": "40",
-    "kind": "linear",
-    "high": 32768,
-    "n_buckets": 3,
-    "description": "SQLite read() (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_WEBAPPS_READ_B": {
-    "expires_in_version": "40",
-    "kind": "linear",
-    "high": 32768,
-    "n_buckets": 3,
-    "description": "SQLite read() (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_PLACES_WRITE_B": {
-    "expires_in_version": "40",
-    "kind": "linear",
-    "high": 32768,
-    "n_buckets": 3,
-    "description": "SQLite write (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_COOKIES_WRITE_B": {
-    "expires_in_version": "40",
-    "kind": "linear",
-    "high": 32768,
-    "n_buckets": 3,
-    "description": "SQLite write (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_WEBAPPS_WRITE_B": {
-    "expires_in_version": "40",
-    "kind": "linear",
-    "high": 32768,
-    "n_buckets": 3,
-    "description": "SQLite write (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
-  },
-  "MOZ_SQLITE_OTHER_WRITE_B": {
-    "expires_in_version": "default",
-    "kind": "linear",
-    "high": 32768,
-    "n_buckets": 3,
-    "description": "SQLite write (bytes)"
-  },
   "MOZ_STORAGE_ASYNC_REQUESTS_MS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
     "expires_in_version": "40",
diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/components/telemetry/histogram-whitelists.json
index 529d9f4d5..5cd7c3145 100644
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -392,43 +392,6 @@
     "MEDIA_WMF_DECODE_ERROR",
     "MIXED_CONTENT_PAGE_LOAD",
     "MIXED_CONTENT_UNBLOCK_COUNTER",
-    "MOZ_SQLITE_COOKIES_OPEN_READAHEAD_MS",
-    "MOZ_SQLITE_COOKIES_READ_B",
-    "MOZ_SQLITE_COOKIES_READ_MAIN_THREAD_MS",
-    "MOZ_SQLITE_COOKIES_READ_MS",
-    "MOZ_SQLITE_COOKIES_SYNC_MAIN_THREAD_MS",
-    "MOZ_SQLITE_COOKIES_SYNC_MS",
-    "MOZ_SQLITE_COOKIES_WRITE_B",
-    "MOZ_SQLITE_COOKIES_WRITE_MAIN_THREAD_MS",
-    "MOZ_SQLITE_COOKIES_WRITE_MS",
-    "MOZ_SQLITE_OPEN_MAIN_THREAD_MS",
-    "MOZ_SQLITE_OPEN_MS",
-    "MOZ_SQLITE_OTHER_READ_B",
-    "MOZ_SQLITE_OTHER_READ_MAIN_THREAD_MS",
-    "MOZ_SQLITE_OTHER_READ_MS",
-    "MOZ_SQLITE_OTHER_SYNC_MAIN_THREAD_MS",
-    "MOZ_SQLITE_OTHER_SYNC_MS",
-    "MOZ_SQLITE_OTHER_WRITE_B",
-    "MOZ_SQLITE_OTHER_WRITE_MAIN_THREAD_MS",
-    "MOZ_SQLITE_OTHER_WRITE_MS",
-    "MOZ_SQLITE_PLACES_READ_B",
-    "MOZ_SQLITE_PLACES_READ_MAIN_THREAD_MS",
-    "MOZ_SQLITE_PLACES_READ_MS",
-    "MOZ_SQLITE_PLACES_SYNC_MAIN_THREAD_MS",
-    "MOZ_SQLITE_PLACES_SYNC_MS",
-    "MOZ_SQLITE_PLACES_WRITE_B",
-    "MOZ_SQLITE_PLACES_WRITE_MAIN_THREAD_MS",
-    "MOZ_SQLITE_PLACES_WRITE_MS",
-    "MOZ_SQLITE_TRUNCATE_MAIN_THREAD_MS",
-    "MOZ_SQLITE_TRUNCATE_MS",
-    "MOZ_SQLITE_WEBAPPS_READ_B",
-    "MOZ_SQLITE_WEBAPPS_READ_MAIN_THREAD_MS",
-    "MOZ_SQLITE_WEBAPPS_READ_MS",
-    "MOZ_SQLITE_WEBAPPS_SYNC_MAIN_THREAD_MS",
-    "MOZ_SQLITE_WEBAPPS_SYNC_MS",
-    "MOZ_SQLITE_WEBAPPS_WRITE_B",
-    "MOZ_SQLITE_WEBAPPS_WRITE_MAIN_THREAD_MS",
-    "MOZ_SQLITE_WEBAPPS_WRITE_MS",
     "NETWORK_CACHE_METADATA_FIRST_READ_SIZE",
     "NETWORK_CACHE_METADATA_FIRST_READ_TIME_MS",
     "NETWORK_CACHE_METADATA_SECOND_READ_TIME_MS",
@@ -1232,43 +1195,6 @@
     "MIXED_CONTENT_HSTS",
     "MIXED_CONTENT_PAGE_LOAD",
     "MIXED_CONTENT_UNBLOCK_COUNTER",
-    "MOZ_SQLITE_COOKIES_OPEN_READAHEAD_MS",
-    "MOZ_SQLITE_COOKIES_READ_B",
-    "MOZ_SQLITE_COOKIES_READ_MAIN_THREAD_MS",
-    "MOZ_SQLITE_COOKIES_READ_MS",
-    "MOZ_SQLITE_COOKIES_SYNC_MAIN_THREAD_MS",
-    "MOZ_SQLITE_COOKIES_SYNC_MS",
-    "MOZ_SQLITE_COOKIES_WRITE_B",
-    "MOZ_SQLITE_COOKIES_WRITE_MAIN_THREAD_MS",
-    "MOZ_SQLITE_COOKIES_WRITE_MS",
-    "MOZ_SQLITE_OPEN_MAIN_THREAD_MS",
-    "MOZ_SQLITE_OPEN_MS",
-    "MOZ_SQLITE_OTHER_READ_B",
-    "MOZ_SQLITE_OTHER_READ_MAIN_THREAD_MS",
-    "MOZ_SQLITE_OTHER_READ_MS",
-    "MOZ_SQLITE_OTHER_SYNC_MAIN_THREAD_MS",
-    "MOZ_SQLITE_OTHER_SYNC_MS",
-    "MOZ_SQLITE_OTHER_WRITE_B",
-    "MOZ_SQLITE_OTHER_WRITE_MAIN_THREAD_MS",
-    "MOZ_SQLITE_OTHER_WRITE_MS",
-    "MOZ_SQLITE_PLACES_READ_B",
-    "MOZ_SQLITE_PLACES_READ_MAIN_THREAD_MS",
-    "MOZ_SQLITE_PLACES_READ_MS",
-    "MOZ_SQLITE_PLACES_SYNC_MAIN_THREAD_MS",
-    "MOZ_SQLITE_PLACES_SYNC_MS",
-    "MOZ_SQLITE_PLACES_WRITE_B",
-    "MOZ_SQLITE_PLACES_WRITE_MAIN_THREAD_MS",
-    "MOZ_SQLITE_PLACES_WRITE_MS",
-    "MOZ_SQLITE_TRUNCATE_MAIN_THREAD_MS",
-    "MOZ_SQLITE_TRUNCATE_MS",
-    "MOZ_SQLITE_WEBAPPS_READ_B",
-    "MOZ_SQLITE_WEBAPPS_READ_MAIN_THREAD_MS",
-    "MOZ_SQLITE_WEBAPPS_READ_MS",
-    "MOZ_SQLITE_WEBAPPS_SYNC_MAIN_THREAD_MS",
-    "MOZ_SQLITE_WEBAPPS_SYNC_MS",
-    "MOZ_SQLITE_WEBAPPS_WRITE_B",
-    "MOZ_SQLITE_WEBAPPS_WRITE_MAIN_THREAD_MS",
-    "MOZ_SQLITE_WEBAPPS_WRITE_MS",
     "MOZ_STORAGE_ASYNC_REQUESTS_MS",
     "MOZ_STORAGE_ASYNC_REQUESTS_SUCCESS",
     "NETWORK_CACHE_METADATA_FIRST_READ_SIZE",
@@ -1885,7 +1811,6 @@
     "WEAVE_CONFIGURED",
     "NEWTAB_PAGE_ENABLED",
     "GRADIENT_DURATION",
-    "MOZ_SQLITE_OPEN_MS",
     "SHOULD_TRANSLATION_UI_APPEAR",
     "NEWTAB_PAGE_LIFE_SPAN",
     "FX_TOTAL_TOP_VISITS",
@@ -1902,7 +1827,6 @@
     "FX_NEW_WINDOW_MS",
     "PDF_VIEWER_TIME_TO_VIEW_MS",
     "SSL_OCSP_MAY_FETCH",
-    "MOZ_SQLITE_OTHER_READ_B",
     "CHECK_JAVA_ENABLED",
     "TRANSLATION_OPPORTUNITIES",
     "FX_SESSION_RESTORE_CONTENT_COLLECT_DATA_LONGEST_OP_MS",
@@ -1928,11 +1852,9 @@
     "FX_SESSION_RESTORE_DOM_STORAGE_SIZE_ESTIMATE_CHARS",
     "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",