corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1652510 - Revert DoH heuristics telemetry event category name to "doh". r=tdsmith,Gijs

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D83357
This commit is contained in:
Nihanth Subramanya
2020-07-13 23:42:27 +00:00
parent 2e74080b6b
commit d075d41102
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/doh/DoHController.jsm
View File

@@ -94,7 +94,7 @@ const TRR_SELECT_DRY_RUN_RESULT_PREF =
"doh-rollout.trr-selection.dry-run-result";
const TRR_SELECT_COMMIT_RESULT_PREF = "doh-rollout.trr-selection.commit-result";
const HEURISTICS_TELEMETRY_CATEGORY = "security.doh.heuristics";
const HEURISTICS_TELEMETRY_CATEGORY = "doh";
const TRRSELECT_TELEMETRY_CATEGORY = "security.doh.trrPerformance";
const kLinkStatusChangedTopic = "network:link-status-changed";

14
browser/components/doh/test/browser/head.js
View File

@@ -181,10 +181,7 @@ async function checkHeuristicsTelemetry(
return events && events.length;
});
events = events.filter(
e =>
e[1] == "security.doh.heuristics" &&
e[2] == "evaluate" &&
e[3] == "heuristics"
e => e[1] == "doh" && e[2] == "evaluate" && e[3] == "heuristics"
);
is(events.length, 1, "Found the expected heuristics event.");
is(events[0][4], decision, "The event records the expected decision");
@@ -210,10 +207,7 @@ function ensureNoHeuristicsTelemetry() {
return;
}
events = events.filter(
e =>
e[1] == "security.doh.heuristics" &&
e[2] == "evaluate" &&
e[3] == "heuristics"
e => e[1] == "doh" && e[2] == "evaluate" && e[3] == "heuristics"
);
is(events.length, 0, "Found no heuristics events.");
}
@@ -226,9 +220,7 @@ async function waitForStateTelemetry(expectedStates) {
).parent;
return events;
});
events = events.filter(
e => e[1] == "security.doh.heuristics" && e[2] == "state"
);
events = events.filter(e => e[1] == "doh" && e[2] == "state");
is(events.length, expectedStates.length, "Found the expected state events.");
for (let state of expectedStates) {
let event = events.find(e => e[3] == state);

2
toolkit/components/telemetry/Events.yaml
View File

@@ -2048,7 +2048,7 @@ pictureinpicture:
expiry_version: "86"
release_channel_collection: opt-out
security.doh.heuristics:
doh:
evaluate:
methods: ["evaluate"]
objects: ["heuristics"]