Skip to content

Commit

Permalink
Bug 1281793 - Remove some non-used telemetry IDs - part 5 - Search an…
Browse files Browse the repository at this point in the history 
…d other stuff, r=gfritzsche
  • Loading branch information
@bakulf
bakulf committed Jun 28, 2016
1 parent 45e04c2 commit 8103093
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 106 deletions.
2 changes: 0 additions & 2 deletions toolkit/components/search/nsSearchService.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2888,7 +2888,6 @@ SearchService.prototype = {
if (this._batchTask)
this._batchTask.disarm();

TelemetryStopwatch.start("SEARCH_SERVICE_BUILD_CACHE_MS");
let cache = {};
let locale = getLocale();
let buildID = Services.appinfo.platformBuildID;
Expand Down Expand Up @@ -2932,7 +2931,6 @@ SearchService.prototype = {
} catch (ex) {
LOG("_buildCache: Could not write to cache file: " + ex);
}
TelemetryStopwatch.finish("SEARCH_SERVICE_BUILD_CACHE_MS");
},

_syncLoadEngines: function SRCH_SVC__syncLoadEngines(cache) {
Expand Down
74 changes: 0 additions & 74 deletions toolkit/components/telemetry/Histograms.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5152,15 +5152,6 @@
"n_values": 10,
"description": "Track click count on about:newtab tiles per index (0-8). For non-default row or column configurations all clicks into the '9' bucket. *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"BROWSERPROVIDER_XUL_IMPORT_TIME": {
"expires_in_version": "40",
"kind": "exponential",
"low": 20,
"high": 600000,
"n_buckets": 20,
"description": "Time for the initial conversion of a XUL places database (ms)",
"cpp_guard": "ANDROID"
},
"BROWSERPROVIDER_XUL_IMPORT_BOOKMARKS": {
"expires_in_version": "default",
"kind": "exponential",
Expand All @@ -5169,14 +5160,6 @@
"description": "Number of bookmarks in the original XUL places database",
"cpp_guard": "ANDROID"
},
"BROWSERPROVIDER_XUL_IMPORT_HISTORY": {
"expires_in_version": "40",
"kind": "exponential",
"high": 1000000,
"n_buckets": 20,
"description": "Number of history entries in the original XUL places database",
"cpp_guard": "ANDROID"
},
"FENNEC_GLOBALHISTORY_ADD_MS": {
"expires_in_version": "never",
"kind": "exponential",
Expand Down Expand Up @@ -5370,13 +5353,6 @@
"description": "Recorded once per session near startup: records true/false whether the search service has engines with icon update URLs.",
"releaseChannelCollection": "opt-out"
},
"SEARCH_SERVICE_BUILD_CACHE_MS": {
"expires_in_version": "40",
"kind": "exponential",
"high": 1000,
"n_buckets": 15,
"description": "Time (ms) it takes to build the cache of the search service"
},
"SEARCH_SERVICE_COUNTRY_FETCH_TIME_MS": {
"alert_emails": ["mhammond@mozilla.com", "gavin@mozilla.com"],
"expires_in_version": "never",
Expand Down Expand Up @@ -6794,38 +6770,6 @@
"n_buckets": 1000,
"description": "The time (in milliseconds) that it took a 'stopTrace' request to go round trip."
},
"COOKIES_3RDPARTY_NUM_SITES_ACCEPTED": {
"expires_in_version": "40",
"kind": "linear",
"low": 5,
"high": 145,
"n_buckets": 30,
"description": "The number of distinct pairs (first-party site, third-party site attempting to set cookie) for which the third-party cookie has been accepted. Sites are considered identical if they have the same eTLD + 1. Measures are normalized per 24h. *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"COOKIES_3RDPARTY_NUM_SITES_BLOCKED": {
"expires_in_version": "40",
"kind": "linear",
"low": 5,
"high": 145,
"n_buckets": 30,
"description": "The number of distinct pairs (first-party site, third-party site attempting to set cookie) for which the third-party cookie has been rejected. Sites are considered identical if they have the same eTLD + 1. Measures are normalized per 24h. *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"COOKIES_3RDPARTY_NUM_ATTEMPTS_ACCEPTED": {
"expires_in_version": "40",
"kind": "linear",
"low": 10,
"high": 500,
"n_buckets": 50,
"description": "The total number of distinct attempts by third-party sites to place cookies which have been accepted. Measures are normalized per 24h. *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"COOKIES_3RDPARTY_NUM_ATTEMPTS_BLOCKED": {
"expires_in_version": "40",
"kind": "linear",
"low": 10,
"high": 500,
"n_buckets": 50,
"description": "The total number of distinct attempts by third-party sites to place cookies which have been rejected. Measures are normalized per 24h. *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"DEVTOOLS_DEBUGGER_RDP_LOCAL_GET_EXECUTABLE_LINES_MS": {
"expires_in_version": "never",
"kind": "exponential",
Expand Down Expand Up @@ -8111,24 +8055,6 @@
"description": "Record on which attempt we successfully unlocked a database. See DATABASE_LOCKED_EXCEPTION.",
"n_values": 5
},
"SQLITEBRIDGE_PROVIDER_PASSWORDS_LOCKED": {
"expires_in_version": "40",
"kind": "enumerated",
"n_values": 10,
"description": "The number of errors using the PasswordsProvider due to a locked DB. *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"SQLITEBRIDGE_PROVIDER_FORMS_LOCKED": {
"expires_in_version": "40",
"kind": "enumerated",
"n_values": 10,
"description": "The number of errors using the FormHistoryProvider due to a locked DB. *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"SQLITEBRIDGE_PROVIDER_HOME_LOCKED": {
"expires_in_version": "40",
"kind": "enumerated",
"n_values": 10,
"description": "The number of errors using the HomeProvider due to a locked DB. *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"SSL_TLS13_INTOLERANCE_REASON_PRE": {
"alert_emails": ["seceng-telemetry@mozilla.com"],
"bug_numbers": [1250568],
Expand Down
10 changes: 0 additions & 10 deletions toolkit/components/telemetry/ThirdPartyCookieProbe.jsm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,6 @@ this.ThirdPartyCookieProbe.prototype = {
return;
}
this._latestFlush = aNow;
let acceptedSites = Services.telemetry.getHistogramById("COOKIES_3RDPARTY_NUM_SITES_ACCEPTED");
let rejectedSites = Services.telemetry.getHistogramById("COOKIES_3RDPARTY_NUM_SITES_BLOCKED");
let acceptedRequests = Services.telemetry.getHistogramById("COOKIES_3RDPARTY_NUM_ATTEMPTS_ACCEPTED");
let rejectedRequests = Services.telemetry.getHistogramById("COOKIES_3RDPARTY_NUM_ATTEMPTS_BLOCKED");
for (let [k, data] of this._thirdPartyCookies) {
acceptedSites.add(data.countAcceptedSites / updays);
rejectedSites.add(data.countRejectedSites / updays);
acceptedRequests.add(data.countAcceptedRequests / updays);
rejectedRequests.add(data.countRejectedRequests / updays);
}
this._thirdPartyCookies.clear();
}
};
Expand Down
20 changes: 0 additions & 20 deletions toolkit/components/telemetry/histogram-whitelists.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
"BACKGROUNDFILESAVER_THREAD_COUNT",
"BAD_FALLBACK_FONT",
"BROWSERPROVIDER_XUL_IMPORT_BOOKMARKS",
"BROWSERPROVIDER_XUL_IMPORT_HISTORY",
"BROWSERPROVIDER_XUL_IMPORT_TIME",
"BROWSER_IS_ASSIST_DEFAULT",
"BROWSER_IS_USER_DEFAULT",
"BROWSER_IS_USER_DEFAULT_ERROR",
Expand Down Expand Up @@ -126,10 +124,6 @@
"COMPOSITE_FRAME_ROUNDTRIP_TIME",
"COMPOSITE_TIME",
"CONTENT_DOCUMENTS_DESTROYED",
"COOKIES_3RDPARTY_NUM_ATTEMPTS_ACCEPTED",
"COOKIES_3RDPARTY_NUM_ATTEMPTS_BLOCKED",
"COOKIES_3RDPARTY_NUM_SITES_ACCEPTED",
"COOKIES_3RDPARTY_NUM_SITES_BLOCKED",
"CRASH_STORE_COMPRESSED_BYTES",
"DATABASE_LOCKED_EXCEPTION",
"DATABASE_SUCCESSFUL_UNLOCK",
Expand Down Expand Up @@ -824,7 +818,6 @@
"REQUESTS_OF_ORIGINAL_CONTENT",
"SAFE_MODE_USAGE",
"SEARCH_COUNTS",
"SEARCH_SERVICE_BUILD_CACHE_MS",
"SEARCH_SERVICE_INIT_MS",
"SECURITY_UI",
"SERVICE_WORKER_CONTROLLED_DOCUMENTS",
Expand Down Expand Up @@ -872,9 +865,6 @@
"SPDY_SYN_REPLY_SIZE",
"SPDY_SYN_SIZE",
"SPDY_VERSION2",
"SQLITEBRIDGE_PROVIDER_FORMS_LOCKED",
"SQLITEBRIDGE_PROVIDER_HOME_LOCKED",
"SQLITEBRIDGE_PROVIDER_PASSWORDS_LOCKED",
"SSL_AUTH_ALGORITHM_FULL",
"SSL_AUTH_ECDSA_CURVE_FULL",
"SSL_AUTH_RSA_KEY_SIZE_FULL",
Expand Down Expand Up @@ -1034,8 +1024,6 @@
"BLOCKED_ON_PLUGIN_STREAM_INIT_MS",
"BLOCKLIST_SYNC_FILE_LOAD",
"BROWSERPROVIDER_XUL_IMPORT_BOOKMARKS",
"BROWSERPROVIDER_XUL_IMPORT_HISTORY",
"BROWSERPROVIDER_XUL_IMPORT_TIME",
"BROWSER_IS_ASSIST_DEFAULT",
"BROWSER_IS_USER_DEFAULT",
"BROWSER_IS_USER_DEFAULT_ERROR",
Expand Down Expand Up @@ -1151,10 +1139,6 @@
"COMPOSITE_FRAME_ROUNDTRIP_TIME",
"COMPOSITE_TIME",
"CONTENT_DOCUMENTS_DESTROYED",
"COOKIES_3RDPARTY_NUM_ATTEMPTS_ACCEPTED",
"COOKIES_3RDPARTY_NUM_ATTEMPTS_BLOCKED",
"COOKIES_3RDPARTY_NUM_SITES_ACCEPTED",
"COOKIES_3RDPARTY_NUM_SITES_BLOCKED",
"COOKIE_SCHEME_SECURITY",
"CRASH_STORE_COMPRESSED_BYTES",
"CYCLE_COLLECTOR",
Expand Down Expand Up @@ -2004,7 +1988,6 @@
"REQUESTS_OF_ORIGINAL_CONTENT",
"SAFE_MODE_USAGE",
"SEARCH_COUNTS",
"SEARCH_SERVICE_BUILD_CACHE_MS",
"SEARCH_SERVICE_COUNTRY_FETCH_CAUSED_SYNC_INIT",
"SEARCH_SERVICE_COUNTRY_FETCH_RESULT",
"SEARCH_SERVICE_COUNTRY_FETCH_TIME_MS",
Expand Down Expand Up @@ -2064,9 +2047,6 @@
"SPDY_SYN_REPLY_SIZE",
"SPDY_SYN_SIZE",
"SPDY_VERSION2",
"SQLITEBRIDGE_PROVIDER_FORMS_LOCKED",
"SQLITEBRIDGE_PROVIDER_HOME_LOCKED",
"SQLITEBRIDGE_PROVIDER_PASSWORDS_LOCKED",
"SSL_AUTH_ALGORITHM_FULL",
"SSL_AUTH_ECDSA_CURVE_FULL",
"SSL_AUTH_RSA_KEY_SIZE_FULL",
Expand Down

0 comments on commit 8103093

Please sign in to comment.