Bug 1531034 - Changing of the guard for URLClassifier and ApplicationReputation. r=chutten

Differential Revision: https://phabricator.services.mozilla.com/D22283

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Dimi Lee 2019-03-18 14:26:00 +00:00
Родитель e2857c55ed
Коммит b528a09441
2 изменённых файлов: 59 добавлений и 88 удалений

Просмотреть файл

@ -99,8 +99,8 @@
},
"APPLICATION_REPUTATION_BINARY": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"bug_numbers": [1480639],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"bug_numbers": [1480639, 1531034],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "categorical",
@ -109,8 +109,8 @@
},
"APPLICATION_REPUTATION_BINARY_ARCHIVE": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"bug_numbers": [1480639],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"bug_numbers": [1480639, 1531034],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "categorical",
@ -119,8 +119,8 @@
},
"APPLICATION_REPUTATION_HASH_LENGTH": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"bug_numbers": [1485180],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"bug_numbers": [1485180, 1531034],
"expires_in_version": "69",
"releaseChannelCollection": "opt-out",
"kind": "categorical",
@ -139,7 +139,7 @@
},
"APPLICATION_REPUTATION_SHOULD_BLOCK": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "boolean",
@ -147,7 +147,7 @@
},
"APPLICATION_REPUTATION_LOCAL": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "enumerated",
@ -156,7 +156,7 @@
},
"APPLICATION_REPUTATION_SERVER": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "enumerated",
@ -175,10 +175,10 @@
},
"APPLICATION_REPUTATION_SERVER_VERDICT": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"bug_numbers": [1272788],
"bug_numbers": [1272788, 1531034],
"kind": "enumerated",
"n_values": 8,
"description": "Application reputation remote verdict (0=SAFE, 1=DANGEROUS, 2=UNCOMMON, 3=POTENTIALLY_UNWANTED, 4=DANGEROUS_HOST, 5=UNKNOWN)"
@ -208,11 +208,11 @@
},
"APPLICATION_REPUTATION_REMOTE_LOOKUP_TIMEOUT": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "boolean",
"bug_numbers": [1172689],
"bug_numbers": [1172689, 1531034],
"description": "Recorded when application reputation remote lookup is performed, `true` is recorded if the lookup times out."
},
"AUDIOSTREAM_FIRST_OPEN_MS": {
@ -4795,8 +4795,8 @@
},
"URLCLASSIFIER_LOOKUP_TIME_2": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"bug_numbers": [1336376],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"bug_numbers": [1336376, 1531034],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
@ -4806,18 +4806,18 @@
},
"URLCLASSIFIER_SHUTDOWN_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
"high": 60000,
"n_buckets": 50,
"bug_numbers": [1315140],
"bug_numbers": [1315140, 1531034],
"description": "Time spent per dbservice shutdown (ms)"
},
"URLCLASSIFIER_CL_CHECK_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
@ -4827,7 +4827,7 @@
},
"URLCLASSIFIER_CL_KEYED_UPDATE_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"keyed": true,
@ -4835,13 +4835,13 @@
"low": 20,
"high": 120000,
"n_buckets": 30,
"bug_numbers": [1315893],
"bug_numbers": [1315893, 1531034],
"description": "Time spent per classifier update (ms), keyed by the name of the provider."
},
"URLCLASSIFIER_ASYNC_CLASSIFYLOCAL_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"bug_numbers": [1341506],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"bug_numbers": [1341506, 1531034],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
@ -4851,7 +4851,7 @@
},
"URLCLASSIFIER_PS_FILELOAD_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
@ -4861,7 +4861,7 @@
},
"URLCLASSIFIER_PS_FALLOCATE_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
@ -4871,7 +4871,7 @@
},
"URLCLASSIFIER_PS_CONSTRUCT_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
@ -4881,68 +4881,68 @@
},
"URLCLASSIFIER_VLPS_FILELOAD_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
"high": 1000,
"n_buckets": 10,
"bug_numbers": [1283007],
"bug_numbers": [1283007, 1531034],
"description": "Time spent loading Variable-Length PrefixSet from file (ms)"
},
"URLCLASSIFIER_VLPS_FALLOCATE_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
"high": 1000,
"n_buckets": 10,
"bug_numbers": [1283007],
"bug_numbers": [1283007, 1531034],
"description": "Time spent fallocating Variable-Length PrefixSet (ms)"
},
"URLCLASSIFIER_VLPS_CONSTRUCT_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
"high": 5000,
"n_buckets": 15,
"bug_numbers": [1336865],
"bug_numbers": [1336865, 1531034],
"description": "Time spent constructing Variable-Length PrefixSet from file (ms)"
},
"URLCLASSIFIER_VLPS_LOAD_CORRUPT": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "boolean",
"bug_numbers": [1305581],
"bug_numbers": [1305581, 1531034],
"description": "Whether or not a variable-length prefix set loaded from disk is corrupted (true = file corrupted)."
},
"URLCLASSIFIER_VLPS_METADATA_CORRUPT": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "boolean",
"bug_numbers": [1433636],
"bug_numbers": [1433636, 1531034],
"description": "Whether or not the metadata for a variable-length prefix set loaded from disk is corrupted (true = file corrupted)."
},
"URLCLASSIFIER_VLPS_LONG_PREFIXES": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "63",
"releaseChannelCollection": "opt-out",
"kind": "enumerated",
"n_values": 32,
"bug_numbers": [1322523],
"bug_numbers": [1322523, 1531034],
"description": "Length of the first 20 long prefixes (> 4 bytes) received in a Safe Browsing V4 table during an update."
},
"URLCLASSIFIER_LC_PREFIXES": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"kind": "linear",
"high": 1500000,
@ -4951,7 +4951,7 @@
},
"URLCLASSIFIER_LC_COMPLETIONS": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"kind": "exponential",
"high": 200,
@ -4960,125 +4960,103 @@
},
"URLCLASSIFIER_UPDATE_REMOTE_NETWORK_ERROR": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "enumerated",
"keyed": true,
"n_values": 30,
"bug_numbers": [1332780],
"bug_numbers": [1332780, 1531034],
"description": "Network error from SafeBrowsing database updates. (0=sucess, 1=unknown error, 2=already connected, 3=not connected, 4=connection refused,5=net timeout, 6=offline, 7=port access not allowed, 8=net reset, 9=net interrupt, 10=proxy connection refused,11=partial transfer,12=inadequate security,13=unknown host,14=dns lookup queue full,15=unknown proxy host"
},
"URLCLASSIFIER_UPDATE_REMOTE_STATUS2": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "enumerated",
"keyed": true,
"n_values": 16,
"bug_numbers": [1311910],
"bug_numbers": [1311910, 1531034],
"description": "Server HTTP status code from SafeBrowsing database updates. (0=1xx, 1=200, 2=2xx, 3=204, 4=3xx, 5=400, 6=4xx, 7=403, 8=404, 9=408, 10=413, 11=5xx, 12=502|504|511, 13=503, 14=505, 15=Other). Keyed by provider"
},
"URLCLASSIFIER_UPDATE_SERVER_RESPONSE_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
"keyed": true,
"high": 100000,
"n_buckets": 30,
"bug_numbers": [1336903],
"bug_numbers": [1336903, 1531034],
"description": "Server response time to update request (ms). Keyed by provider"
},
"URLCLASSIFIER_UPDATE_TIMEOUT": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "enumerated",
"keyed": true,
"n_values": 4,
"bug_numbers": [1336904],
"bug_numbers": [1336904, 1531034],
"description": " Whether or not an update timed out (0 = no timeout, 1 = server respond timeout, 2 = overall timeout). Keyed by provider"
},
"URLCLASSIFIER_COMPLETE_REMOTE_STATUS2": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "enumerated",
"keyed": true,
"n_values": 16,
"bug_numbers": [1150921, 1311926],
"bug_numbers": [1150921, 1311926, 1531034],
"description": "Server HTTP status code from remote SafeBrowsing gethash lookups. (0=1xx, 1=200, 2=2xx, 3=204, 4=3xx, 5=400, 6=4xx, 7=403, 8=404, 9=408, 10=413, 11=5xx, 12=502|504|511, 13=503, 14=505, 15=Other). Keyed by provider"
},
"URLCLASSIFIER_COMPLETION_ERROR": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "enumerated",
"n_values": 16,
"bug_numbers": [1276826],
"bug_numbers": [1276826, 1531034],
"description": "SafeBrowsing v4 hash completion error (0 = success, 1 = parsing failure, 2 = unknown threat type)"
},
"URLCLASSIFIER_COMPLETE_TIMEOUT2": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "boolean",
"keyed": true,
"bug_numbers": [1172688, 1311926],
"bug_numbers": [1172688, 1311926, 1531034],
"description": "This metric is recorded every time a gethash lookup is performed, `true` is recorded if the lookup times out. Keyed by provider"
},
"URLCLASSIFIER_COMPLETE_SERVER_RESPONSE_TIME": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
"keyed": true,
"high": 5000,
"n_buckets": 15,
"bug_numbers": [1336903],
"bug_numbers": [1336903, 1531034],
"description": "Server response time to getHash request (ms). Keyed by provider"
},
"URLCLASSIFIER_UPDATE_ERROR": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
"releaseChannelCollection": "opt-out",
"kind": "enumerated",
"keyed": true,
"n_values": 16,
"bug_numbers": [1311910],
"bug_numbers": [1311910, 1531034],
"description": "Whether or not an error was encountered while processing a Safe Browsing update (0 = success, 1 = unspecified error, 2 = addition of an already existing prefix, 3 = parser got into an infinite loop, 4 = removal index out of bounds, 5 = checksum mismatch, 6 = missing checksum, 7 = update while shutdown, 8 = cannot find table, 9 = build prefix failure, 10 = write disk failure, 11 = protocol parser error). Keyed by provider"
},
"URLCLASSIFIER_POSITIVE_CACHE_DURATION": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "63",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
"high": 86400000,
"n_buckets": 50,
"bug_numbers": [1338082],
"description": "Positive cache duration (ms) received in fullhash response from any v4 provider"
},
"URLCLASSIFIER_NEGATIVE_CACHE_DURATION": {
"record_in_processes": ["main", "content"],
"alert_emails": ["francois@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "63",
"releaseChannelCollection": "opt-out",
"kind": "exponential",
"high": 86400000,
"n_buckets": 50,
"bug_numbers": [1338082],
"description": "Negative cache duration (ms) received in fullhash response from any v4 provider"
},
"URLCLASSIFIER_THREATHIT_NETWORK_ERROR": {
"record_in_processes": ["main", "content"],
"alert_emails": ["tnguyen@mozilla.com, safebrowsing-telemetry@mozilla.org"],
@ -14122,8 +14100,8 @@
},
"URLCLASSIFIER_UI_EVENTS": {
"record_in_processes": ["main", "content"],
"alert_emails": ["seceng-telemetry@mozilla.com", "francois@mozilla.com"],
"bug_numbers": [1375277],
"alert_emails": ["seceng-telemetry@mozilla.com", "dlee@mozilla.com"],
"bug_numbers": [1375277, 1531034],
"expires_in_version": "never",
"kind": "enumerated",
"n_values": 64,

Просмотреть файл

@ -775,9 +775,6 @@ nsUrlClassifierUtils::ParseFindFullHashResponseV4(
aCallback->OnCompleteHashFound(
nsDependentCString(hash.c_str(), hash.length()), tableNames,
cacheDurationSec);
Telemetry::Accumulate(Telemetry::URLCLASSIFIER_POSITIVE_CACHE_DURATION,
cacheDurationSec * PR_MSEC_PER_SEC);
}
auto minWaitDuration = DurationToMs(r.minimum_wait_duration());
@ -787,10 +784,6 @@ nsUrlClassifierUtils::ParseFindFullHashResponseV4(
Telemetry::Accumulate(Telemetry::URLCLASSIFIER_COMPLETION_ERROR,
hasUnknownThreatType ? UNKNOWN_THREAT_TYPE : SUCCESS);
Telemetry::Accumulate(Telemetry::URLCLASSIFIER_NEGATIVE_CACHE_DURATION,
negCacheDurationSec * PR_MSEC_PER_SEC);
return NS_OK;
}