Split usage/err enable flag

Author: xindzhan

src/Common/Commands.Common/ApplicationInsights.config

@@ -38,10 +38,15 @@ public abstract class AzurePSCmdlet : PSCmdlet
 
         protected AzurePSQoSEvent QosEvent;
 
-        protected virtual bool IsMetricEnabled {
+        protected virtual bool IsUsageMetricEnabled {
             get { return false; }
         }
 
+        protected virtual bool IsErrorMetricEnabled
+        {
+            get { return true; }
+        }
+
         [Parameter(Mandatory = false, HelpMessage = "In-memory profile.")]
         public AzureProfile Profile { get; set; }
 
@@ -522,7 +527,7 @@ protected void InitializeQosEvent()
             {
                 CmdletType = this.GetType().Name,
                 IsSuccess = true,
-                UID = MetricHelper.GenerateSha256HashString(this.Profile.DefaultSubscription.Id.ToString())
+                Uid = MetricHelper.GenerateSha256HashString(this.Profile.DefaultSubscription.Id.ToString())
             };
         }
 
@@ -533,15 +538,12 @@ protected void LogQosEvent(bool waitForMetricSending = false)
         {
             QosEvent.FinishQosEvent();
             WriteVerbose(QosEvent.ToString());
-            if (!IsMetricEnabled)
-            {
-                return;
-            }
 
             try
             {
-                MetricHelper.LogUsageEvent(QosEvent);
+                MetricHelper.LogQoSEvent(QosEvent, IsUsageMetricEnabled, IsErrorMetricEnabled);
                 MetricHelper.FlushMetric(waitForMetricSending);
+                WriteVerbose("Finish sending metric.");
             }
             catch (Exception e)
             {

src/Common/Commands.Common/AzurePSCmdlet.cs

@@ -190,9 +190,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ApplicationInsights.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

src/Common/Commands.Common/Commands.Common.csproj

@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
-using System.Linq;
-using System.Management.Automation;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
@@ -23,6 +19,8 @@ public static class MetricHelper
         static MetricHelper()
         {            
             TelemetryClient = new TelemetryClient();
+            //InstrumentationKey shall be injected in build server
+            TelemetryClient.InstrumentationKey = "ce08abab-065a-4af8-a997-fdd4cd5481b4";
             //TelemetryClient.Context.Location.Ip = "0.0.0.0";
 
             if (!IsMetricTermAccepted())
@@ -37,40 +35,47 @@ static MetricHelper()
             }
         }
 
-        public static void LogUsageEvent(AzurePSQoSEvent qos)
+        public static void LogQoSEvent(AzurePSQoSEvent qos, bool isUsageMetricEnabled, bool isErrorMetricEnabled)
         {
             if (!IsMetricTermAccepted())
             {
                 return;
             }
 
-            var tcEvent = new EventTelemetry("CmdletUsage");
-            //tcEvent.Context.Location.Ip = "0.0.0.0";
-            tcEvent.Context.User.Id = qos.UID;
-            tcEvent.Context.User.UserAgent = AzurePowerShell.UserAgentValue.ToString();
-            tcEvent.Properties.Add("CmdletType", qos.CmdletType);
-            tcEvent.Properties.Add("IsSuccess", qos.IsSuccess.ToString());
-            tcEvent.Properties.Add("Duration", qos.Duration.TotalSeconds.ToString(CultureInfo.InvariantCulture));
-
-            TelemetryClient.TrackEvent(tcEvent);
+            if (isUsageMetricEnabled)
+            {
+                LogUsageEvent(qos);
+            }
 
-            if (qos.Exception != null)
+            if (isErrorMetricEnabled && qos.Exception != null)
             {
                 LogExceptionEvent(qos);
             }
         }
 
-        private static void LogExceptionEvent(AzurePSQoSEvent qos)
+        private static void LogUsageEvent(AzurePSQoSEvent qos)
         {
+            var tcEvent = new RequestTelemetry(qos.CmdletType, qos.StartTime, qos.Duration, string.Empty, qos.IsSuccess);
+            tcEvent.Context.User.Id = qos.Uid;
+            tcEvent.Context.User.UserAgent = AzurePowerShell.UserAgentValue.ToString();
+            tcEvent.Context.Device.OperatingSystem = Environment.OSVersion.VersionString;
+
+            TelemetryClient.TrackRequest(tcEvent);
+        }
 
+        private static void LogExceptionEvent(AzurePSQoSEvent qos)
+        {
+            //Log as custome event to exclude actual exception message
             var tcEvent = new EventTelemetry("CmdletError");
             tcEvent.Properties.Add("ExceptionType", qos.Exception.GetType().FullName);
+            tcEvent.Properties.Add("StackTrace", qos.Exception.StackTrace);
             if (qos.Exception.InnerException != null)
             {
                 tcEvent.Properties.Add("InnerExceptionType", qos.Exception.InnerException.GetType().FullName);
+                tcEvent.Properties.Add("InnerStackTrace", qos.Exception.InnerException.StackTrace);
             }
 
-            tcEvent.Context.User.Id = qos.UID;
+            tcEvent.Context.User.Id = qos.Uid;
             tcEvent.Properties.Add("CmdletType", qos.CmdletType);
 
             TelemetryClient.TrackEvent(tcEvent);
@@ -129,14 +134,16 @@ public class AzurePSQoSEvent
 {
     private readonly Stopwatch _timer;
 
+    public DateTimeOffset StartTime { get; set; }
     public TimeSpan Duration { get; set; }
     public bool IsSuccess { get; set; }
     public string CmdletType { get; set; }
     public Exception Exception { get; set; }
-    public string UID { get; set; }
+    public string Uid { get; set; }
 
     public AzurePSQoSEvent()
     {
+        StartTime = DateTimeOffset.Now;
         _timer = new Stopwatch();
         _timer.Start();
     }

src/Common/Commands.Common/MetricHelper.cs

@@ -23,7 +23,7 @@ public abstract class ComputeClientBaseCmdlet : AzurePSCmdlet
     {
         protected const string VirtualMachineExtensionType = "Microsoft.Compute/virtualMachines/extensions";
 
-        protected override bool IsMetricEnabled
+        protected override bool IsUsageMetricEnabled
         {
             get { return true; }
         }

src/ResourceManager/Compute/Commands.Compute/Common/ComputeClientBaseCmdlet.cs

@@ -51,7 +51,7 @@ public class NewAzureVMConfigCommand : AzurePSCmdlet
         [ValidateNotNullOrEmpty]
         public string AvailabilitySetId { get; set; }
 
-        protected override bool IsMetricEnabled
+        protected override bool IsUsageMetricEnabled
         {
             get { return true; }
         }