Merge pull request #6274 from praries880/update_telemetry

Fix for #4965,

Author: praries880

src/Common/Commands.Common/MetricHelper.cs

@@ -226,6 +226,16 @@ private void LogExceptionEvent(AzurePSQoSEvent qos)
                 eventProperties.Add("Message", "Message removed due to PII.");
                 eventProperties.Add("StackTrace", qos.Exception.StackTrace);
                 eventProperties.Add("ExceptionType", qos.Exception.GetType().ToString());
+                Exception innerEx = qos.Exception.InnerException;
+                int exceptionCount = 0;
+                //keep goin till we get to the last inner exception
+                while (innerEx != null)
+                {
+                    //Increment the inner exception count so that we can tell which is the outermost
+                    //and which the innermost
+                    eventProperties.Add("InnerExceptionType-"+exceptionCount++, innerEx.GetType().ToString());
+                    innerEx = innerEx.InnerException;
+                }
                 client.TrackException(null, eventProperties, eventMetrics);
             }
         }
@@ -266,6 +276,9 @@ private void PopulatePropertiesFromQos(AzurePSQoSEvent qos, IDictionary<string,
             eventProperties.Add("HashMacAddress", HashMacAddress);
             eventProperties.Add("PowerShellVersion", PSVersion);
             eventProperties.Add("Version", AzurePowerShell.AssemblyVersion);
+            eventProperties.Add("CommandParameterSetName", qos.ParameterSetName);
+            eventProperties.Add("CommandInvocationName", qos.InvocationName);
+
             if (qos.InputFromPipeline != null)
             {
                 eventProperties.Add("InputFromPipeline", qos.InputFromPipeline.Value.ToString());
@@ -371,6 +384,8 @@ public class AzurePSQoSEvent
     public string Uid { get; set; }
     public string ClientRequestId { get; set; }
     public string SessionId { get; set; }
+    public string ParameterSetName { get; set; }
+    public string InvocationName { get; set; }
     public Dictionary<string, string> CustomProperties { get; private set; }
 
     public AzurePSQoSEvent()

src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

@@ -204,8 +204,14 @@ protected override void InitializeQosEvent()
                 ClientRequestId = this._clientRequestId,
                 SessionId = _sessionId,
                 IsSuccess = true,
+                ParameterSetName = this.ParameterSetName
             };
 
+            if (this.MyInvocation != null && !string.IsNullOrWhiteSpace(this.MyInvocation.InvocationName))
+            {
+                _qosEvent.InvocationName = this.MyInvocation.InvocationName;
+            }
+
             if (this.MyInvocation != null && this.MyInvocation.BoundParameters != null 
                 && this.MyInvocation.BoundParameters.Keys != null)
             {

src/ResourceManager/Profile/ChangeLog.md

@@ -18,6 +18,10 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Added the following three values to the telemetry :
+  - Inner exception types
+  - ParameterSetName
+  - InvocationName
 * Fix issue where version 10.0.3 of Newtonsoft.Json wasn't being loaded on module import
 
 ## Version 5.1.0