Merge pull request #139 from jpogran/update-telemetry-to-prod

(GH-138) Update telemetry to prod

Author: glennsarti

client/package.json

@@ -6,7 +6,7 @@
   "publisher": "jpogran",
   "license": "SEE LICENSE IN LICENSE.txt",
   "icon": "images/Puppet-Logo-Amber-sm.png",
-  "aiKey": "ceeced67-dfaf-4693-a31f-640fd740bb15",
+  "aiKey": "147f322c-ecdc-4db2-a818-da8be01f07f5",
   "galleryBanner": {
     "color": "#000000",
     "theme": "dark"

client/src/commands/pdk/pdkNewClassCommand.ts

@@ -26,9 +26,7 @@ export class pdkNewClassCommand {
       this.terminal.sendText(`pdk new class ${moduleName}`);
       this.terminal.show();
       if (reporter) {
-        reporter.sendTelemetryEvent('command', {
-          command: messages.PDKCommandStrings.PdkNewClassCommandId
-        });
+        reporter.sendTelemetryEvent(messages.PDKCommandStrings.PdkNewClassCommandId);
       }
     })
   }

client/src/commands/pdk/pdkNewModuleCommand.ts

@@ -36,9 +36,7 @@ export class pdkNewModuleCommand {
         this.terminal.sendText(`code ${dir}`)
         this.terminal.show();
         if (reporter) {
-          reporter.sendTelemetryEvent('command', {
-            command: messages.PDKCommandStrings.PdkNewModuleCommandId
-          });
+          reporter.sendTelemetryEvent(messages.PDKCommandStrings.PdkNewModuleCommandId);
         }
       })
     })

client/src/commands/pdk/pdkTestCommand.ts

@@ -20,9 +20,7 @@ export class pdkTestUnitCommand {
     this.terminal.sendText(`pdk test unit`);
     this.terminal.show();
     if (reporter) {
-      reporter.sendTelemetryEvent('command', {
-        command: messages.PDKCommandStrings.PdkTestUnitCommandId
-      });
+      reporter.sendTelemetryEvent(messages.PDKCommandStrings.PdkTestUnitCommandId);
     }
   }
 

client/src/commands/pdk/pdkValidateCommand.ts

@@ -20,9 +20,7 @@ export class pdkValidateCommand {
     this.terminal.sendText(`pdk validate`);
     this.terminal.show();
     if (reporter) {
-      reporter.sendTelemetryEvent('command', {
-        command: messages.PDKCommandStrings.PdkValidateCommandId
-      });
+      reporter.sendTelemetryEvent(messages.PDKCommandStrings.PdkValidateCommandId);
     }
   }
 

client/src/commands/puppet/puppetResourceCommand.ts

@@ -65,9 +65,7 @@ export class puppetResourceCommand {
 
             this.editCurrentDocument(doc.uri, resourceResult.data, newPosition);
             if (reporter) {
-              reporter.sendTelemetryEvent('command', {
-                command: messages.PuppetCommandStrings.PuppetResourceCommandId
-              });
+              reporter.sendTelemetryEvent(messages.PuppetCommandStrings.PuppetResourceCommandId);
             }
           });
       }

client/src/connection.ts

@@ -6,6 +6,7 @@ import { Logger } from '../src/logging';
 import { LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient';
 import { setupPuppetCommands } from '../src/commands/puppetcommands';
 import { setupPDKCommands } from '../src/commands/pdkcommands';
+import { reporter } from './telemetry/telemetry';
 import * as messages from '../src/messages';
 import fs = require('fs');
 
@@ -326,6 +327,16 @@ export class ConnectionManager implements IConnectionManager {
       langClient.logger.debug('Language server client started, setting puppet version')
       languageServerClient.sendRequest(messages.PuppetVersionRequest.type).then((versionDetails) => {
         this.setConnectionStatus(versionDetails.puppetVersion, ConnectionStatus.Running);
+        if (reporter) {
+          reporter.sendTelemetryEvent('puppetVersion' +versionDetails.puppetVersion);
+          reporter.sendTelemetryEvent('facterVersion' + versionDetails.facterVersion);
+          reporter.sendTelemetryEvent('languageServerVersion' + versionDetails.languageServerVersion);
+          reporter.sendTelemetryEvent('version', {
+            puppetVersion: versionDetails.puppetVersion,
+            facterVersion: versionDetails.facterVersion,
+            languageServerVersion: versionDetails.languageServerVersion,
+          });
+        }
       });
     }, (reason) => {
       this.setSessionFailure("Could not start language service: ", reason);

client/src/providers/previewNodeGraphProvider.ts

@@ -82,9 +82,7 @@ export class PuppetNodeGraphContentProvider implements vscode.TextDocumentConten
           var errorContent = `<div>${compileResult.error}</div>`
           if (compileResult.error == null) { errorContent = ''; }
           if (reporter) {
-            reporter.sendTelemetryEvent('command', {
-              command: messages.PuppetCommandStrings.PuppetNodeGraphToTheSideCommandId
-            });
+            reporter.sendTelemetryEvent(messages.PuppetCommandStrings.PuppetNodeGraphToTheSideCommandId);
           }
 
           // WARNING - THIS IS A MAJOR HACK!!!