Merge pull request #587 from jpogran/maint-remove-telemetry-class-wrapper

(maint) Remove TelemetryReporter Wrapper

Author: glennsarti

src/extension.ts

@@ -19,7 +19,7 @@ import { ConnectionType, ProtocolType, PuppetInstallType, ISettings } from './se
 import { ILogger } from './logging';
 import { OutputChannelLogger } from './logging/outputchannel';
 import { legacySettings, SettingsFromWorkspace } from './settings';
-import { Reporter, reporter } from './telemetry/telemetry';
+import { reporter } from './telemetry';
 import { PuppetModuleHoverFeature } from './feature/PuppetModuleHoverFeature';
 
 const axios = require('axios');
@@ -41,8 +41,6 @@ export function activate(context: vscode.ExtensionContext) {
 
   checkForLegacySettings();
 
-  context.subscriptions.push(new Reporter(extContext));
-
   const settings = SettingsFromWorkspace();
   const previousInstallType = settings.installType;
   configSettings = CreateAggregrateConfiguration(settings);
@@ -114,6 +112,7 @@ export function deactivate() {
   if (connectionHandler !== undefined) {
     connectionHandler.stop();
   }
+  reporter.dispose();
 }
 
 function checkForLegacySettings() {

src/feature/BoltFeature.ts

@@ -2,7 +2,7 @@ import { ExtensionContext, commands, window, Uri } from 'vscode';
 import { IFeature } from '../feature';
 import * as path from 'path';
 import * as fs from 'fs';
-import { reporter } from '../telemetry/telemetry';
+import { reporter } from '../telemetry';
 
 export class BoltFeature implements IFeature {
   dispose() { }

src/feature/NodeGraphFeature.ts

@@ -7,7 +7,7 @@ import { IFeature } from "../feature";
 import { ILogger } from "../logging";
 import { ConnectionStatus } from '../interfaces';
 import { CompileNodeGraphRequest, CompileNodeGraphResponse } from '../messages';
-import { reporter } from '../telemetry/telemetry';
+import { reporter } from '../telemetry';
 import * as viz from 'viz.js';
 import { ConnectionHandler } from "../handler";
 import { ISettings, SettingsFromWorkspace } from '../settings';

src/feature/PDKFeature.ts

@@ -4,7 +4,7 @@ import * as vscode from 'vscode';
 import { IFeature } from '../feature';
 import { ILogger } from '../logging';
 import { PDKCommandStrings } from '../messages';
-import { reporter } from '../telemetry/telemetry';
+import { reporter } from '../telemetry';
 
 export class PDKFeature implements IFeature {
   private terminal: vscode.Terminal;

src/feature/PuppetResourceFeature.ts

@@ -4,7 +4,7 @@ import * as vscode from 'vscode';
 import { IFeature } from '../feature';
 import { ILogger } from '../logging';
 import { PuppetCommandStrings, PuppetResourceRequestParams, PuppetResourceRequest, PuppetResourceResponse } from '../messages';
-import { reporter } from '../telemetry/telemetry';
+import { reporter } from '../telemetry';
 import { ConnectionStatus } from '../interfaces';
 import { ConnectionHandler } from '../handler';
 import { ISettings, SettingsFromWorkspace } from '../settings';

src/handler.ts

@@ -6,7 +6,7 @@ import { ConnectionType, ProtocolType } from './settings';
 import { IPuppetStatusBar } from './feature/PuppetStatusBarFeature';
 import { OutputChannelLogger } from './logging/outputchannel';
 import { PuppetVersionDetails, PuppetVersionRequest, PuppetCommandStrings } from './messages';
-import { reporter } from './telemetry/telemetry';
+import { reporter } from './telemetry';
 import { puppetFileLangID, puppetLangID} from './extension';
 import { IAggregateConfiguration } from './configuration';
 

src/telemetry.ts

@@ -0,0 +1,30 @@
+import * as vscode from 'vscode';
+import TelemetryReporter from 'vscode-extension-telemetry';
+
+
+export const reporter:TelemetryReporter = getTelemetryReporter();
+
+function getTelemetryReporter() {
+  let pkg = getPackageInfo();
+  let reporter:TelemetryReporter = new TelemetryReporter(
+    pkg.name,
+    pkg.version,
+    pkg.aiKey
+  );
+  return reporter;
+}
+
+function getPackageInfo(): IPackageInfo {
+  let pkg = vscode.extensions.getExtension('jpogran.puppet-vscode');
+  return {	
+    name: pkg.packageJSON.name,	
+    version: pkg.packageJSON.version,	
+    aiKey: pkg.packageJSON.aiKey	
+  };	
+}
+
+interface IPackageInfo {	
+  name: string;	
+  version: string;	
+  aiKey: string;	
+}