Attachment 8768065 Details for Bug 1218576

[patch] 0005-bug-1218576-Use-child-aggregation-to-populate-childP.patch

0005-bug-1218576-Use-child-aggregation-to-populate-childP.patch (text/plain), 5.59 KB, created by Chris H-C :chutten

(hide)

Description:

Filename:

MIME Type:

Creator: Chris H-C :chutten

Size: 5.59 KB

patch

obsolete

>From 0e92ab5eac35449a0f280d536b5fb811a18bb122 Mon Sep 17 00:00:00 2001
>From: Chris H-C <chutten@mozilla.com>
>Date: Wed, 29 Jun 2016 15:46:22 -0400
>Subject: [PATCH 5/9] bug 1218576 - Use child aggregation to populate
> childPayloads
>
>By using and clearing subsession child telemetry on child process shutdown,
>childPayloads storage and transmission remains the same.
>
>In addition, we can use the subsession child telemetry that wasn't cleared into
>childPayloads as the "current child process telemetry" information we wanted in
>the first place.
>
>MozReview-Commit-ID: AqG2jmBBC2W
>---
> toolkit/components/telemetry/TelemetrySession.jsm | 47 +++++++++++++++++++----
> 1 file changed, 39 insertions(+), 8 deletions(-)
>
>diff --git a/toolkit/components/telemetry/TelemetrySession.jsm b/toolkit/components/telemetry/TelemetrySession.jsm
>index 55c6fe9..d7a947c 100644
>--- a/toolkit/components/telemetry/TelemetrySession.jsm
>+++ b/toolkit/components/telemetry/TelemetrySession.jsm
>@@ -41,6 +41,10 @@ const REASON_TEST_PING = "test-ping";
> const REASON_ENVIRONMENT_CHANGE = "environment-change";
> const REASON_SHUTDOWN = "shutdown";
> 
>+const CHILD_PROCESS_TYPES = {
>+  CONTENT: "#child",
>+}
>+
> const ENVIRONMENT_CHANGE_LISTENER = "TelemetrySession::onEnvironmentChange";
> 
> const MS_IN_ONE_HOUR  = 60 * 60 * 1000;
>@@ -875,8 +879,10 @@ var Impl = {
>                                        : Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTOUT;
>   },
> 
>-  getHistograms: function getHistograms(subsession, clearSubsession) {
>-    this._log.trace("getHistograms - subsession: " + subsession + ", clearSubsession: " + clearSubsession);
>+  getHistograms: function getHistograms(subsession, clearSubsession, childProcessType) {
>+    this._log.trace("getHistograms - subsession: " + subsession +
>+                    ", clearSubsession: " + clearSubsession +
>+                    ", childProcessType: " + childProcessType);
> 
>     let registered =
>       Telemetry.registeredHistograms(this.getDatasetType(), []);
>@@ -885,13 +891,18 @@ var Impl = {
>     let ret = {};
> 
>     for (let name of registered) {
>+      if (childProcessType) {
>+        name += childProcessType;
>+      }
>       for (let n of [name, "STARTUP_" + name]) {
>         if (n in hls) {
>           // Omit telemetry test histograms outside of tests.
>           if (n.startsWith('TELEMETRY_TEST_') && this._testing == false) {
>             this._log.trace("getHistograms - Skipping test histogram: " + n);
>           } else {
>-            ret[n] = this.packHistogram(hls[n]);
>+            ret[childProcessType ?
>+                n.substring(0, n.length - childProcessType.length) :
>+                n] = this.packHistogram(hls[n]);
>           }
>         }
>       }
>@@ -919,8 +930,10 @@ var Impl = {
>     return ret;
>   },
> 
>-  getKeyedHistograms: function(subsession, clearSubsession) {
>-    this._log.trace("getKeyedHistograms - subsession: " + subsession + ", clearSubsession: " + clearSubsession);
>+  getKeyedHistograms: function(subsession, clearSubsession, childProcessType) {
>+    this._log.trace("getKeyedHistograms - subsession: " + subsession +
>+                    ", clearSubsession: " + clearSubsession +
>+                    ", childProcessType: " + childProcessType);
> 
>     let registered =
>       Telemetry.registeredKeyedHistograms(this.getDatasetType(), []);
>@@ -932,7 +945,9 @@ var Impl = {
>         this._log.trace("getKeyedHistograms - Skipping test histogram: " + id);
>         continue;
>       }
>-      let keyed = Telemetry.getKeyedHistogramById(id);
>+      let keyed = Telemetry.getKeyedHistogramById(childProcessType ?
>+                                                  id + childProcessType :
>+                                                  id);
>       let snapshot = null;
>       if (subsession) {
>         snapshot = clearSubsession ? keyed.snapshotSubsessionAndClear()
>@@ -1248,8 +1263,12 @@ var Impl = {
>     let payloadObj = {
>       ver: PAYLOAD_VERSION,
>       simpleMeasurements: simpleMeasurements,
>-      histograms: protect(() => this.getHistograms(isSubsession, clearSubsession)),
>-      keyedHistograms: protect(() => this.getKeyedHistograms(isSubsession, clearSubsession)),
>+      histograms: Utils.isContentProcess ?
>+                    undefined :
>+                    protect(() => this.getHistograms(isSubsession, clearSubsession)),
>+      keyedHistograms: Utils.isContentProcess ?
>+                       undefined :
>+                       protect(() => this.getKeyedHistograms(isSubsession, clearSubsession)),
>       scalars: protect(() => this.getScalars(isSubsession, clearSubsession)),
>     };
> 
>@@ -1295,7 +1314,14 @@ var Impl = {
> 
>     if (this._childTelemetry.length) {
>       payloadObj.childPayloads = protect(() => this.getChildPayloads());
>+    } else {
>+      payloadObj.childPayloads = [];
>     }
>+    // Add the latest child subsession info. It only has hgrams
>+    payloadObj.childPayloads.push({
>+      histograms: protect(() => this.getHistograms(true, false, CHILD_PROCESS_TYPES.CONTENT)),
>+      keyedHistograms: protect(() => this.getKeyedHistograms(true, false, CHILD_PROCESS_TYPES.CONTENT)),
>+    })
> 
>     return payloadObj;
>   },
>@@ -1540,6 +1566,11 @@ var Impl = {
>       let source = message.data.childUUID;
>       delete message.data.childUUID;
> 
>+      // We use and clear the subsession hgrams here to emulate the current
>+      // saved-session-like behaviour for individual child payloads.
>+      message.data.histograms = this.getHistograms(true, true, CHILD_PROCESS_TYPES.CONTENT);
>+      message.data.keyedHistograms = this.getKeyedHistograms(true, true, CHILD_PROCESS_TYPES.CONTENT);
>+
>       this._childTelemetry.push({
>         source: source,
>         payload: message.data,
>-- 
>2.7.4.windows.1
>

Actions: View | Diff | Review

Attachments on bug 1218576: 8760367 | 8762163 | 8764976 | 8765964 | 8768060 | 8768061 | 8768063 | 8768064 | 8768065 | 8768066 | 8768068 | 8768069 | 8768072 | 8770187 | 8770189 | 8770190 | 8770191 | 8770192 | 8770193 | 8770194 | 8770195 | 8770196 | 8770197 | 8771095 | 8771096 | 8771097 | 8771098 | 8771099 | 8771103 | 8772410 | 8772411 | 8772412 | 8773780 | 8773781 | 8773782 | 8775162 | 8775163 | 8776914 | 8777042 | 8781667 | 8781668 | 8781669 | 8781670 | 8781672 | 8781673 | 8781674 | 8781677 | 8781678 | 8781679 | 8781680 | 8781681 | 8781682 | 8782636 | 8782637 | 8782939 | 8782943 | 8783654 | 8783655 | 8783995 | 8783997 | 8786401 | 8786403 | 8787320 | 8787737 | 8788461 | 8791972 | 8791974 | 8791977 | 8792556

Bugzilla

Quick Search

Attachment 8768065 Details for Bug 1218576