Merge pull request #8328 from Microsoft/users/divman/portTelemetry2

Port docker telemetry changes from master to M140

Author: divman25

Tasks/DockerComposeV0/dockercompose.ts

@@ -42,6 +42,11 @@ if (nopIfNoDockerComposeFile && !tl.exist(dockerFile)) {
         .then(function runAction() {
             // Run the specified action
             var action = tl.getInput("action", true);
+            var telemetry = {
+                registryType: registryType,
+                command: action !== "Run a Docker Compose command" ? action : tl.getInput("dockerComposeCommand", true)
+            };
+            
             /* tslint:disable:no-var-requires */
             return require({
                 "Build services": "./dockercomposebuild",

Tasks/DockerComposeV0/task.json

@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 4,
-        "Patch": 19
+        "Patch": 20
     },
     "demands": [],
     "preview": "false",

Tasks/DockerComposeV0/task.loc.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 4,
-    "Patch": 19
+    "Patch": 20
   },
   "demands": [],
   "preview": "false",

Tasks/DockerV0/container.ts

@@ -32,6 +32,15 @@ connection.open(tl.getInput("dockerHostEndpoint"), registryAuthenticationToken);
 
 // Run the specified action
 var action = tl.getInput("action", true);
+var telemetry = {
+    registryType: registryType,
+    command: action !== "Run a Docker command" ? action : tl.getInput("customCommand", true)
+};
+
+console.log("##vso[telemetry.publish area=%s;feature=%s]%s",
+    "TaskEndpointId",
+    "DockerV0",
+    JSON.stringify(telemetry));
 /* tslint:disable:no-var-requires */
 require({
     "Build an image": "./containerbuild",

Tasks/DockerV0/task.json

@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 3,
-        "Patch": 17
+        "Patch": 18
     },
     "demands": [],
     "preview": "false",

Tasks/DockerV0/task.loc.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 3,
-    "Patch": 17
+    "Patch": 18
   },
   "demands": [],
   "preview": "false",

Tasks/DockerV1/container.ts

@@ -44,8 +44,17 @@ var dockerCommandMap = {
     "logout": "./dockerlogout"
 }
 
+var telemetry = {
+    registryType: registryType,
+    command: command
+};
+console.log("##vso[telemetry.publish area=%s;feature=%s]%s",
+    "TaskEndpointId",
+    "DockerV1",
+    JSON.stringify(telemetry));
+
 var commandImplementation = require("./containercommand");
-if(command in dockerCommandMap) {
+if (command in dockerCommandMap) {
     commandImplementation = require(dockerCommandMap[command]);
 }
 

Tasks/DockerV1/task.json

@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 1,
-        "Patch": 5
+        "Patch": 6
     },
     "demands": [],
     "releaseNotes": "Simplified the task by:<br/>&nbsp;- Providing an option to simply select or type a command.<br/>&nbsp;- Retaining the useful input fields and providing an option to pass the rest as an argument to the command.",

Tasks/DockerV1/task.loc.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 1,
-    "Patch": 5
+    "Patch": 6
   },
   "demands": [],
   "releaseNotes": "ms-resource:loc.releaseNotes",

Tasks/HelmDeployV0/src/helm.ts

@@ -58,6 +58,16 @@ async function run() {
 
     var helmCli : helmcli = new helmcli();
     helmCli.login();
+    var connectionType = tl.getInput("connectionType", true);
+    var telemetry = {
+        connectionType: connectionType,
+        command: command
+    };
+
+    console.log("##vso[telemetry.publish area=%s;feature=%s]%s",
+        "TaskEndpointId",
+        "HelmDeployV0",
+        JSON.stringify(telemetry));
 
     try {
         switch (command){