Merge pull request #301 from maddieclayton/TelemetryAdjustment

Add required telemetry changes

Author: markcowl

src/Common/Commands.Common/AzurePSCmdlet.cs

@@ -522,6 +522,7 @@ protected void LogQosEvent()
 
             try
             {
+                _metricHelper.SetPSHost(this.Host);
                 _metricHelper.LogQoSEvent(_qosEvent, IsUsageMetricEnabled, IsErrorMetricEnabled);
                 _metricHelper.FlushMetric();
                 WriteDebug("Finish sending metric.");

src/Common/Commands.Common/MetricHelper.cs

@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Management.Automation.Host;
 using System.Security.Cryptography;
 using System.Text;
 
@@ -31,6 +32,8 @@ public class MetricHelper
     {
         protected INetworkHelper _networkHelper;
         private const int FlushTimeoutInMilli = 5000;
+        private const string DefaultPSVersion = "3.0.0.0";
+        private const string EventName = "cmdletInvocation";
 
         /// <summary>
         /// The collection of telemetry clients.
@@ -58,6 +61,26 @@ public class MetricHelper
 
         private AzurePSDataCollectionProfile _profile;
 
+        private static PSHost _host;
+
+        private static string _psVersion;
+
+        protected string PSVersion
+        {
+            get
+            {
+                if (_host != null)
+                {
+                    _psVersion = _host.Version.ToString();
+                }
+                else
+                {
+                    _psVersion = DefaultPSVersion;
+                }
+                return _psVersion;
+            }
+        }
+
         public string HashMacAddress
         {
             get
@@ -171,7 +194,7 @@ private void LogUsageEvent(AzurePSQoSEvent qos)
                 {
                     var pageViewTelemetry = new PageViewTelemetry
                     {
-                        Name = qos.CommandName ?? "empty",
+                        Name = EventName,
                         Duration = qos.Duration,
                         Timestamp = qos.StartTime
                     };
@@ -217,13 +240,19 @@ private void LoadTelemetryClientContext(AzurePSQoSEvent qos, TelemetryContext cl
             }
         }
 
+        public void SetPSHost(PSHost host)
+        {
+            _host = host;
+        }
+
         private void PopulatePropertiesFromQos(AzurePSQoSEvent qos, IDictionary<string, string> eventProperties)
         {
             if (qos == null)
             {
                 return;
             }
 
+            eventProperties.Add("Command", qos.CommandName);
             eventProperties.Add("IsSuccess", qos.IsSuccess.ToString());
             eventProperties.Add("ModuleName", qos.ModuleName);
             eventProperties.Add("ModuleVersion", qos.ModuleVersion);
@@ -234,6 +263,8 @@ private void PopulatePropertiesFromQos(AzurePSQoSEvent qos, IDictionary<string,
             eventProperties.Add("x-ms-client-request-id", qos.ClientRequestId);
             eventProperties.Add("UserAgent", AzurePowerShell.UserAgentValue.ToString());
             eventProperties.Add("HashMacAddress", HashMacAddress);
+            eventProperties.Add("PowerShellVersion", PSVersion);
+            eventProperties.Add("Version", AzurePowerShell.AssemblyVersion);
             if (qos.InputFromPipeline != null)
             {
                 eventProperties.Add("InputFromPipeline", qos.InputFromPipeline.Value.ToString());