Bug 860846 - part 3 - send telemetry pings to new, partitioned URLs; r=vladan

This commit is contained in:
Nathan Froyd 2013-06-19 11:44:11 -04:00
parent 85ed544fb1
commit dd7db9d39b
2 changed files with 9 additions and 2 deletions

View File

@ -676,10 +676,14 @@ TelemetryPing.prototype = {
submissionPath: function submissionPath(ping) {
let slug;
if (!ping || ping.reason == "test-ping") {
if (!ping) {
slug = this._uuid;
} else {
slug = ping.slug;
let info = ping.payload.info;
let pathComponents = [ping.slug, info.reason, info.appName,
info.appVersion, info.appUpdateChannel,
info.appBuildID];
slug = pathComponents.join("/");
}
return "/submit/telemetry/" + slug;
},

View File

@ -198,8 +198,11 @@ function checkPayloadInfo(payload, reason) {
function checkPayload(request, reason, successfulPings) {
let payload = decodeRequestPayload(request);
// Take off ["","submit","telemetry"].
let pathComponents = request.path.split("/").slice(3);
checkPayloadInfo(payload, reason);
do_check_eq(reason, pathComponents[1]);
do_check_eq(request.getHeader("content-type"), "application/json; charset=UTF-8");
do_check_true(payload.simpleMeasurements.uptime >= 0);
do_check_true(payload.simpleMeasurements.startupInterrupted === 1);