732970 - fix thinko in persistent telemetry merge

Status: RESOLVED FIXED

(Toolkit :: Telemetry, defect)

Description

[Nathan Froyd [:froydnj]]

We have:

  getHistograms: function getHistograms() {
    let hls = Telemetry.histogramSnapshots;

but later on:

    if (havePreviousSession) {
      payloadObj.histograms = this.getHistograms(this._prevSession.snapshots);
    }
    else {
      payloadObj.simpleMeasurements = getSimpleMeasurements();
      payloadObj.histograms = this.getHistograms(Telemetry.histogramSnapshots);

which is clearly not winning.  Earlier versions of the persistent telemetry stuff did the right thing, so this is the result of some bad merge-fu.

Comment 1

[Nathan Froyd [:froydnj]]

Attachment: patch

Straightforward patch.  I love JavaScript.

Comment 2

[Mozilla RelEng Bot]

Autoland Patchset:
	Patches: 602934
	Branch: mozilla-central => try
	Destination: http://hg.mozilla.org/try/pushloghtml?changeset=d089d32dd6b4
Try run started, revision d089d32dd6b4. To cancel or monitor the job, see: https://tbpl.mozilla.org/?tree=Try&rev=d089d32dd6b4

Comment 3

[Mozilla RelEng Bot]

Try run for d089d32dd6b4 is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=d089d32dd6b4
Results (out of 28 total builds):
    success: 23
    warnings: 5
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/[e-mail]-d089d32dd6b4

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/54a7b61b9535

Comment 5

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/54a7b61b9535