Bug 1065925 - Remove code for expiring Places telemetry probes. r=mak

This commit is contained in:
Manu Jain 2014-09-30 08:54:00 +02:00
parent 370fda5da0
commit d212e2478a
5 changed files with 0 additions and 96 deletions

View File

@ -153,16 +153,7 @@ this.BookmarkJSONUtils = Object.freeze({
Components.utils.reportError("Unable to report telemetry.");
}
startTime = Date.now();
let hash = generateHash(jsonString);
// Report the time taken to generate the hash.
try {
Services.telemetry
.getHistogramById("PLACES_BACKUPS_HASHING_MS")
.add(Date.now() - startTime);
} catch (ex) {
Components.utils.reportError("Unable to report telemetry.");
}
if (hash === aOptions.failIfHashIs) {
let e = new Error("Hash conflict");

View File

@ -880,11 +880,6 @@ this.PlacesDBUtils = {
query: `SELECT count(*) FROM moz_bookmarks
WHERE parent = :tags_folder` },
{ histogram: "PLACES_FOLDERS_COUNT",
query: `SELECT count(*) FROM moz_bookmarks
WHERE TYPE = :type_folder
AND parent NOT IN (0, :places_root, :tags_folder)` },
{ histogram: "PLACES_KEYWORDS_COUNT",
query: "SELECT count(*) FROM moz_keywords" },
@ -921,14 +916,6 @@ this.PlacesDBUtils = {
}
},
{ histogram: "PLACES_DATABASE_JOURNALSIZE_MB",
callback: function () {
let DBFile = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
DBFile.append("places.sqlite-wal");
return parseInt(DBFile.fileSize / BYTES_PER_MEBIBYTE);
}
},
{ histogram: "PLACES_DATABASE_PAGESIZE_B",
query: "PRAGMA page_size /* PlacesDBUtils.jsm PAGESIZE_B */" },
@ -946,18 +933,9 @@ this.PlacesDBUtils = {
{ histogram: "PLACES_ANNOS_BOOKMARKS_COUNT",
query: "SELECT count(*) FROM moz_items_annos" },
// LENGTH is not a perfect measure, since it returns the number of bytes
// only for BLOBs, the number of chars for anything else. Though it's
// the best approximation we have.
{ histogram: "PLACES_ANNOS_BOOKMARKS_SIZE_KB",
query: "SELECT SUM(LENGTH(content))/1024 FROM moz_items_annos" },
{ histogram: "PLACES_ANNOS_PAGES_COUNT",
query: "SELECT count(*) FROM moz_annos" },
{ histogram: "PLACES_ANNOS_PAGES_SIZE_KB",
query: "SELECT SUM(LENGTH(content))/1024 FROM moz_annos" },
{ histogram: "PLACES_MAINTENANCE_DAYSFROMLAST",
callback: function () {
try {

View File

@ -15,7 +15,6 @@
#include "nsINavHistoryService.h"
#include "nsPrintfCString.h"
#include "nsNavHistory.h"
#include "mozilla/Telemetry.h"
#include "mozilla/Likely.h"
using namespace mozilla::storage;
@ -457,8 +456,6 @@ namespace places {
NS_ENSURE_SUCCESS(rv, rv);
NS_ASSERTION(numEntries > 0, "unexpected number of arguments");
Telemetry::AutoTimer<Telemetry::PLACES_FRECENCY_CALC_TIME_MS> timer;
int64_t pageId = aArguments->AsInt64(0);
int32_t typed = numEntries > 1 ? aArguments->AsInt32(1) : 0;
int32_t fullVisitCount = numEntries > 2 ? aArguments->AsInt32(2) : 0;

View File

@ -9,13 +9,10 @@ let histograms = {
PLACES_PAGES_COUNT: function (val) do_check_eq(val, 1),
PLACES_BOOKMARKS_COUNT: function (val) do_check_eq(val, 1),
PLACES_TAGS_COUNT: function (val) do_check_eq(val, 1),
PLACES_FOLDERS_COUNT: function (val) do_check_eq(val, 1),
PLACES_KEYWORDS_COUNT: function (val) do_check_eq(val, 1),
PLACES_SORTED_BOOKMARKS_PERC: function (val) do_check_eq(val, 100),
PLACES_TAGGED_BOOKMARKS_PERC: function (val) do_check_eq(val, 100),
PLACES_DATABASE_FILESIZE_MB: function (val) do_check_true(val > 0),
// The journal may have been truncated.
PLACES_DATABASE_JOURNALSIZE_MB: function (val) do_check_true(val >= 0),
PLACES_DATABASE_PAGESIZE_B: function (val) do_check_eq(val, 32768),
PLACES_DATABASE_SIZE_PER_PAGE_B: function (val) do_check_true(val > 0),
PLACES_EXPIRATION_STEPS_TO_CLEAN2: function (val) do_check_true(val > 1),
@ -23,10 +20,7 @@ let histograms = {
PLACES_IDLE_FRECENCY_DECAY_TIME_MS: function (val) do_check_true(val > 0),
PLACES_IDLE_MAINTENANCE_TIME_MS: function (val) do_check_true(val > 0),
PLACES_ANNOS_BOOKMARKS_COUNT: function (val) do_check_eq(val, 1),
PLACES_ANNOS_BOOKMARKS_SIZE_KB: function (val) do_check_eq(val, 1),
PLACES_ANNOS_PAGES_COUNT: function (val) do_check_eq(val, 1),
PLACES_ANNOS_PAGES_SIZE_KB: function (val) do_check_eq(val, 1),
PLACES_FRECENCY_CALC_TIME_MS: function (val) do_check_true(val >= 0),
PLACES_MAINTENANCE_DAYSFROMLAST: function (val) do_check_true(val >= 0),
}

View File

@ -3081,15 +3081,6 @@
"extended_statistics_ok": true,
"description": "PLACES: Number of tags"
},
"PLACES_FOLDERS_COUNT": {
"alert_emails": ["places-telemetry-alerts@mozilla.com"],
"expires_in_version": "40",
"kind": "exponential",
"high": "200",
"n_buckets": 10,
"extended_statistics_ok": true,
"description": "PLACES: Number of folders"
},
"PLACES_KEYWORDS_COUNT": {
"expires_in_version": "never",
"kind": "exponential",
@ -3131,15 +3122,6 @@
"extended_statistics_ok": true,
"description": "PLACES: Time to convert and write bookmarks.html"
},
"PLACES_BACKUPS_HASHING_MS": {
"expires_in_version": "40",
"kind": "exponential",
"low": 50,
"high": 2000,
"n_buckets": 10,
"extended_statistics_ok": true,
"description": "PLACES: Time to calculate the md5 hash for a backup"
},
"PLACES_FAVICON_ICO_SIZES": {
"expires_in_version" : "never",
"kind": "exponential",
@ -3265,15 +3247,6 @@
"extended_statistics_ok": true,
"description": "PLACES: Database filesize (MB)"
},
"PLACES_DATABASE_JOURNALSIZE_MB": {
"alert_emails": ["places-telemetry-alerts@mozilla.com"],
"expires_in_version": "40",
"kind": "exponential",
"high": "50",
"n_buckets": 10,
"extended_statistics_ok": true,
"description": "PLACES: Database journal size (MB)"
},
"PLACES_DATABASE_PAGESIZE_B": {
"expires_in_version": "never",
"kind": "exponential",
@ -3370,16 +3343,6 @@
"extended_statistics_ok": true,
"description": "PLACES: Number of bookmarks annotations"
},
"PLACES_ANNOS_BOOKMARKS_SIZE_KB": {
"alert_emails": ["places-telemetry-alerts@mozilla.com"],
"expires_in_version": "40",
"kind": "exponential",
"low": 10,
"high": "10000",
"n_buckets": 10,
"extended_statistics_ok": true,
"description": "PLACES: Size of bookmarks annotations (KB)"
},
"PLACES_ANNOS_PAGES_COUNT": {
"expires_in_version": "never",
"kind": "exponential",
@ -3389,25 +3352,6 @@
"extended_statistics_ok": true,
"description": "PLACES: Number of pages annotations"
},
"PLACES_ANNOS_PAGES_SIZE_KB": {
"alert_emails": ["places-telemetry-alerts@mozilla.com"],
"expires_in_version": "40",
"kind": "exponential",
"low": 10,
"high": "10000",
"n_buckets": 10,
"extended_statistics_ok": true,
"description": "PLACES: Size of pages annotations (KB)"
},
"PLACES_FRECENCY_CALC_TIME_MS": {
"alert_emails": ["places-telemetry-alerts@mozilla.com"],
"expires_in_version": "40",
"kind": "exponential",
"high": "100",
"n_buckets": 10,
"extended_statistics_ok": true,
"description": "PLACES: Time to calculate frecency of a page (ms)"
},
"PLACES_MAINTENANCE_DAYSFROMLAST": {
"expires_in_version" : "never",
"kind": "exponential",