From f9ca780dd3133582fad5fdfb4e0acf288caad10c Mon Sep 17 00:00:00 2001
From: groovecoder <luke.crouch@gmail.com>
Date: Fri, 16 Jun 2017 14:13:51 -0500
Subject: [PATCH] for #598: stop calling getCurrentPingData

See https://github.com/mozilla/testpilot/commit/fa0f73fd6a0911f54366e3c8bef836995d4491fe
---
 lib/testpilot/experiment.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/testpilot/experiment.js b/lib/testpilot/experiment.js
index 1b4e98f..97e4103 100644
--- a/lib/testpilot/experiment.js
+++ b/lib/testpilot/experiment.js
@@ -6,6 +6,9 @@ const { storage } = require('sdk/simple-storage');
 const {
   TelemetryController
 } = require('resource://gre/modules/TelemetryController.jsm');
+const {
+  TelemetryEnvironment
+} = require ('resource://gre/modules/TelemetryEnvironment.jsm');
 const { Request } = require('sdk/request');
 
 
@@ -44,9 +47,7 @@ function experimentPing(event) {
     });
 
     // TODO: DRY up this ping centre code here and in lib/Telemetry.
-    const pcPing = TelemetryController.getCurrentPingData();
-    pcPing.type = 'testpilot';
-    pcPing.payload = payload;
+    const environment = TelemetryEnvironment.currentEnvironment;
     const pcPayload = {
       // 'method' is used by testpilot-metrics library.
       // 'event' was used before that library existed.
@@ -54,10 +55,10 @@ function experimentPing(event) {
       client_time: makeTimestamp(parsed.timestamp || timestamp),
       addon_id: subject,
       addon_version: addon.version,
-      firefox_version: pcPing.environment.build.version,
-      os_name: pcPing.environment.system.os.name,
-      os_version: pcPing.environment.system.os.version,
-      locale: pcPing.environment.settings.locale,
+      firefox_version: environment.build.version,
+      os_name: environment.system.os.name,
+      os_version: environment.system.os.version,
+      locale: environment.settings.locale,
       // Note: these two keys are normally inserted by the ping-centre client.
       client_id: ClientID.getCachedClientID(),
       topic: 'testpilot'