Skip to content

GitLab

T
tangled
Commit 71e1f811 authored by gab's avatar gab Committed by Commit bot
Browse files
Options

Fix missing SB2DatabaseFailure histogram entries 

Also fix some mislabelled entries in the histogram enum.

Make the declaration site explicit to decrease the likelihood of such
omissions/mislabels happening again in the future.

BUG=None

Review URL: https://codereview.chromium.org/968253002

Cr-Commit-Position: refs/heads/master@{#318893}
parent 35e1c076
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 64 deletions
chrome/browser/safe_browsing/safe_browsing_database.h
View file @ 71e1f811
...@@ -240,44 +240,45 @@ class SafeBrowsingDatabase { ...@@ -240,44 +240,45 @@ class SafeBrowsingDatabase {
static base::FilePath UnwantedSoftwareDBFilename( static base::FilePath UnwantedSoftwareDBFilename(
const base::FilePath& db_filename); const base::FilePath& db_filename);
// Enumerate failures for histogramming purposes. DO NOT CHANGE THE // SafeBrowsing Database failure types for histogramming purposes. Explicitly
// ORDERING OF THESE VALUES. // label new values and do not re-use old values. Also make sure to reflect
// modifications made below in the SB2DatabaseFailure histogram enum.
enum FailureType { enum FailureType {
FAILURE_DATABASE_CORRUPT, FAILURE_DATABASE_CORRUPT = 0,
FAILURE_DATABASE_CORRUPT_HANDLER, FAILURE_DATABASE_CORRUPT_HANDLER = 1,
FAILURE_BROWSE_DATABASE_UPDATE_BEGIN, FAILURE_BROWSE_DATABASE_UPDATE_BEGIN = 2,
FAILURE_BROWSE_DATABASE_UPDATE_FINISH, FAILURE_BROWSE_DATABASE_UPDATE_FINISH = 3,
FAILURE_DATABASE_FILTER_MISSING_OBSOLETE, FAILURE_DATABASE_FILTER_MISSING_OBSOLETE = 4,
FAILURE_DATABASE_FILTER_READ_OBSOLETE, FAILURE_DATABASE_FILTER_READ_OBSOLETE = 5,
FAILURE_DATABASE_FILTER_WRITE_OBSOLETE, FAILURE_DATABASE_FILTER_WRITE_OBSOLETE = 6,
FAILURE_DATABASE_FILTER_DELETE, FAILURE_DATABASE_FILTER_DELETE = 7,
FAILURE_DATABASE_STORE_MISSING, FAILURE_DATABASE_STORE_MISSING = 8,
FAILURE_DATABASE_STORE_DELETE, FAILURE_DATABASE_STORE_DELETE = 9,
FAILURE_DOWNLOAD_DATABASE_UPDATE_BEGIN, FAILURE_DOWNLOAD_DATABASE_UPDATE_BEGIN = 10,
FAILURE_DOWNLOAD_DATABASE_UPDATE_FINISH, FAILURE_DOWNLOAD_DATABASE_UPDATE_FINISH = 11,
FAILURE_WHITELIST_DATABASE_UPDATE_BEGIN, FAILURE_WHITELIST_DATABASE_UPDATE_BEGIN = 12,
FAILURE_WHITELIST_DATABASE_UPDATE_FINISH, FAILURE_WHITELIST_DATABASE_UPDATE_FINISH = 13,
FAILURE_BROWSE_PREFIX_SET_READ, FAILURE_BROWSE_PREFIX_SET_READ = 14,
FAILURE_BROWSE_PREFIX_SET_WRITE, FAILURE_BROWSE_PREFIX_SET_WRITE = 15,
FAILURE_BROWSE_PREFIX_SET_DELETE, FAILURE_BROWSE_PREFIX_SET_DELETE = 16,
FAILURE_EXTENSION_BLACKLIST_UPDATE_BEGIN, FAILURE_EXTENSION_BLACKLIST_UPDATE_BEGIN = 17,
FAILURE_EXTENSION_BLACKLIST_UPDATE_FINISH, FAILURE_EXTENSION_BLACKLIST_UPDATE_FINISH = 18,
FAILURE_EXTENSION_BLACKLIST_DELETE, FAILURE_EXTENSION_BLACKLIST_DELETE = 19,
FAILURE_SIDE_EFFECT_FREE_WHITELIST_UPDATE_BEGIN, FAILURE_SIDE_EFFECT_FREE_WHITELIST_UPDATE_BEGIN = 20,
FAILURE_SIDE_EFFECT_FREE_WHITELIST_UPDATE_FINISH, FAILURE_SIDE_EFFECT_FREE_WHITELIST_UPDATE_FINISH = 21,
FAILURE_SIDE_EFFECT_FREE_WHITELIST_DELETE, FAILURE_SIDE_EFFECT_FREE_WHITELIST_DELETE = 22,
FAILURE_SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_READ, FAILURE_SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_READ = 23,
FAILURE_SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_WRITE, FAILURE_SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_WRITE = 24,
FAILURE_SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_DELETE, FAILURE_SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_DELETE = 25,
FAILURE_IP_BLACKLIST_UPDATE_BEGIN, FAILURE_IP_BLACKLIST_UPDATE_BEGIN = 26,
FAILURE_IP_BLACKLIST_UPDATE_FINISH, FAILURE_IP_BLACKLIST_UPDATE_FINISH = 27,
FAILURE_IP_BLACKLIST_UPDATE_INVALID, FAILURE_IP_BLACKLIST_UPDATE_INVALID = 28,
FAILURE_IP_BLACKLIST_DELETE, FAILURE_IP_BLACKLIST_DELETE = 29,
FAILURE_UNWANTED_SOFTWARE_DATABASE_UPDATE_BEGIN, FAILURE_UNWANTED_SOFTWARE_DATABASE_UPDATE_BEGIN = 30,
FAILURE_UNWANTED_SOFTWARE_DATABASE_UPDATE_FINISH, FAILURE_UNWANTED_SOFTWARE_DATABASE_UPDATE_FINISH = 31,
FAILURE_UNWANTED_SOFTWARE_PREFIX_SET_READ, FAILURE_UNWANTED_SOFTWARE_PREFIX_SET_READ = 32,
FAILURE_UNWANTED_SOFTWARE_PREFIX_SET_WRITE, FAILURE_UNWANTED_SOFTWARE_PREFIX_SET_WRITE = 33,
FAILURE_UNWANTED_SOFTWARE_PREFIX_SET_DELETE, FAILURE_UNWANTED_SOFTWARE_PREFIX_SET_DELETE = 34,
// Memory space for histograms is determined by the max. ALWAYS // Memory space for histograms is determined by the max. ALWAYS
// ADD NEW VALUES BEFORE THIS ONE. // ADD NEW VALUES BEFORE THIS ONE.
......
tools/metrics/histograms/histograms.xml
View file @ 71e1f811
...@@ -57801,33 +57801,41 @@ To add a new entry, add it with any value and run test to compute valid value. ...@@ -57801,33 +57801,41 @@ To add a new entry, add it with any value and run test to compute valid value.
</enum> </enum>
<enum name="SB2DatabaseFailure" type="int"> <enum name="SB2DatabaseFailure" type="int">
<int value="0" label="CORRUPT"/> <int value="0" label="FAILURE_DATABASE_CORRUPT"/>
<int value="1" label="CORRUPT_HANDLER"/> <int value="1" label="FAILURE_DATABASE_CORRUPT_HANDLER"/>
<int value="2" label="BROWSE_DB_UPDATE_BEGIN"/> <int value="2" label="FAILURE_BROWSE_DATABASE_UPDATE_BEGIN"/>
<int value="3" label="BROWSE_DB_UPDATE_FINISH"/> <int value="3" label="FAILURE_BROWSE_DATABASE_UPDATE_FINISH"/>
<int value="4" label="FILTER_MISSING"/> <int value="4" label="FAILURE_DATABASE_FILTER_MISSING_OBSOLETE"/>
<int value="5" label="FILTER_READ"/> <int value="5" label="FAILURE_DATABASE_FILTER_READ_OBSOLETE"/>
<int value="6" label="FILTER_WRITE"/> <int value="6" label="FAILURE_DATABASE_FILTER_WRITE_OBSOLETE"/>
<int value="7" label="FILTER_DELETE"/> <int value="7" label="FAILURE_DATABASE_FILTER_DELETE"/>
<int value="8" label="STORE_MISSING"/> <int value="8" label="FAILURE_DATABASE_STORE_MISSING"/>
<int value="9" label="STORE_DELETE"/> <int value="9" label="FAILURE_DATABASE_STORE_DELETE"/>
<int value="10" label="DOWNLOAD_DB_UPDATE_BEGIN"/> <int value="10" label="FAILURE_DOWNLOAD_DATABASE_UPDATE_BEGIN"/>
<int value="11" label="DOWNLOAD_DB_UPDATE_FINISH"/> <int value="11" label="FAILURE_DOWNLOAD_DATABASE_UPDATE_FINISH"/>
<int value="12" label="CSD_DB_UPDATE_BEGIN"/> <int value="12" label="FAILURE_WHITELIST_DATABASE_UPDATE_BEGIN"/>
<int value="13" label="CSD_DB_UPDATE_FINISH"/> <int value="13" label="FAILURE_WHITELIST_DATABASE_UPDATE_FINISH"/>
<int value="14" label="BROWSE_PREFIX_SET_MISSING"/> <int value="14" label="FAILURE_BROWSE_PREFIX_SET_READ"/>
<int value="15" label="BROWSE_PREFIX_SET_READ"/> <int value="15" label="FAILURE_BROWSE_PREFIX_SET_WRITE"/>
<int value="16" label="BROWSE_PREFIX_SET_WRITE"/> <int value="16" label="FAILURE_BROWSE_PREFIX_SET_DELETE"/>
<int value="17" label="BROWSE_PREFIX_SET_DELETE"/> <int value="17" label="FAILURE_EXTENSION_BLACKLIST_UPDATE_BEGIN"/>
<int value="18" label="EXTENSION_BLACKLIST_UPDATE_BEGIN"/> <int value="18" label="FAILURE_EXTENSION_BLACKLIST_UPDATE_FINISH"/>
<int value="19" label="EXTENSION_BLACKLIST_UPDATE_FINISH"/> <int value="19" label="FAILURE_EXTENSION_BLACKLIST_DELETE"/>
<int value="20" label="EXTENSION_BLACKLIST_UPDATE_DELETE"/> <int value="20" label="FAILURE_SIDE_EFFECT_FREE_WHITELIST_UPDATE_BEGIN"/>
<int value="21" label="SIDE_EFFECT_FREE_WHITELIST_UPDATE_BEGIN"/> <int value="21" label="FAILURE_SIDE_EFFECT_FREE_WHITELIST_UPDATE_FINISH"/>
<int value="22" label="SIDE_EFFECT_FREE_WHITELIST_UPDATE_FINISH"/> <int value="22" label="FAILURE_SIDE_EFFECT_FREE_WHITELIST_DELETE"/>
<int value="23" label="SIDE_EFFECT_FREE_WHITELIST_DELETE"/> <int value="23" label="FAILURE_SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_READ"/>
<int value="24" label="SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_READ"/> <int value="24" label="FAILURE_SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_WRITE"/>
<int value="25" label="SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_WRITE"/> <int value="25" label="FAILURE_SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_DELETE"/>
<int value="26" label="SIDE_EFFECT_FREE_WHITELIST_PREFIX_SET_DELETE"/> <int value="26" label="FAILURE_IP_BLACKLIST_UPDATE_BEGIN"/>
<int value="27" label="FAILURE_IP_BLACKLIST_UPDATE_FINISH"/>
<int value="28" label="FAILURE_IP_BLACKLIST_UPDATE_INVALID"/>
<int value="29" label="FAILURE_IP_BLACKLIST_DELETE"/>
<int value="30" label="FAILURE_UNWANTED_SOFTWARE_DATABASE_UPDATE_BEGIN"/>
<int value="31" label="FAILURE_UNWANTED_SOFTWARE_DATABASE_UPDATE_FINISH"/>
<int value="32" label="FAILURE_UNWANTED_SOFTWARE_PREFIX_SET_READ"/>
<int value="33" label="FAILURE_UNWANTED_SOFTWARE_PREFIX_SET_WRITE"/>
<int value="34" label="FAILURE_UNWANTED_SOFTWARE_PREFIX_SET_DELETE"/>
</enum> </enum>
<enum name="SB2DownloadChecks" type="int"> <enum name="SB2DownloadChecks" type="int">
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment