From 69d72b230396d24044756b7562abc72f3bf9cb26 Mon Sep 17 00:00:00 2001 From: abe33 Date: Tue, 6 Nov 2018 13:52:54 +0100 Subject: [PATCH 1/2] :fire: health metrics --- src/kite.js | 18 ------------------ src/metrics.js | 14 -------------- 2 files changed, 32 deletions(-) diff --git a/src/kite.js b/src/kite.js index 79d1521..1316441 100644 --- a/src/kite.js +++ b/src/kite.js @@ -369,26 +369,9 @@ const Kite = { this.checkState('pollingInterval'); }, config.get('pollingInterval') || 5000); - // We monitor kited health - this.healthInterval = setInterval(checkHealth, 60 * 1000 * 10); - checkHealth(); - metrics.featureFulfilled('starting'); return this; - - function checkHealth() { - KiteAPI.checkHealth().then(state => { - switch (state) { - case 0: return metrics.trackHealth('unsupported'); - case 1: return metrics.trackHealth('uninstalled'); - case 2: return metrics.trackHealth('installed'); - case 3: return metrics.trackHealth('running'); - case 4: return metrics.trackHealth('reachable'); - case 5: return metrics.trackHealth('authenticated'); - } - }); - } }, reset() { @@ -406,7 +389,6 @@ const Kite = { delete this.lastStatus; delete this.lastPolledState; delete this.pollingInterval; - delete this.healthInterval; }, deactivate() { diff --git a/src/metrics.js b/src/metrics.js index 2ee609b..81a5c77 100644 --- a/src/metrics.js +++ b/src/metrics.js @@ -77,19 +77,6 @@ function track(event, properties = {}) { } } -function trackHealth(value) { - if (vscode.workspace.getConfiguration('kite').editorMetricsEnabled === 'yes') { - track('kited_health', { - user_id: macaddress, - sent_at: Math.floor(new Date().getTime() / 1000), - source: 'vscode', - os_name: getOsName(), - plugin_version: kitePkg.version, - value, - }); - } -} - function getOsName() { switch (os.platform()) { case 'darwin': return 'macos'; @@ -104,7 +91,6 @@ module.exports = { OS_VERSION, featureRequested, featureFulfilled, - trackHealth, getOsName, version: kitePkg.version, track: () => {} From b5cdbfa28650d094f3db0e859f08e680c19e9745 Mon Sep 17 00:00:00 2001 From: abe33 Date: Mon, 12 Nov 2018 11:16:09 +0100 Subject: [PATCH 2/2] :fire: track function --- src/metrics.js | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/src/metrics.js b/src/metrics.js index 81a5c77..648fae7 100644 --- a/src/metrics.js +++ b/src/metrics.js @@ -7,26 +7,13 @@ const {Logger} = require('kite-installer'); const kitePkg = require('../package.json'); const localconfig = require('./localconfig.js'); const {metricsCounterPath} = require('./urls'); -const Segment = require('analytics-node'); const OS_VERSION = os.type() + ' ' + os.release(); const EDITOR_UUID = vscode.env.machineId; -const ANALYTICS = new Segment( - process.env.NODE_ENV === 'development' - ? 'tlsFlkyXKAyTtbIYMsx8slXJxDQv8Izn' - : 'hZHSUR8FABnNidGOa3WnYAtHyBBsaoGA'); - let Kite; -let macaddress; - -require('getmac').getMac((err, mac) => { - if (err) { throw err; } - macaddress = mac; -}); - // Generate a unique ID for this user and save it for future use. function distinctID() { var id = localconfig.get('distinctID'); @@ -63,20 +50,6 @@ function featureFulfilled(name) { sendFeatureMetric(`vscode_${name}_fulfilled`); } -function track(event, properties = {}) { - const e = { - event, - userId: '0', - properties - }; - - if(process.env.NODE_ENV !== 'test') { - Logger.debug('segment:', e); - - if (macaddress) { ANALYTICS.track(e); } - } -} - function getOsName() { switch (os.platform()) { case 'darwin': return 'macos';