Merge remote-tracking branch 'upstream/clu' into clu

Author: arroyc

src/CLU/Commands.Common/CmdletInfoHandler.cs

@@ -64,6 +64,10 @@ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage reques
             }
             if (ClientRequestId != null)
             {
+                if (request.Headers.Contains("x-ms-client-request-id"))
+                {
+                    request.Headers.Remove("x-ms-client-request-id");
+                }
                 request.Headers.TryAddWithoutValidation("x-ms-client-request-id", ClientRequestId);
             }
             return base.SendAsync(request, cancellationToken);

src/CLU/Commands.ResourceManager.Common/AzureRmCmdlet.cs

@@ -23,6 +23,8 @@
 using System.Management.Automation;
 using System.Management.Automation.Host;
 using System.Reflection;
+using System.Linq;
+using System.Globalization;
 
 namespace Microsoft.Azure.Commands.ResourceManager.Common
 {
@@ -140,9 +142,10 @@ protected override void PromptForDataCollectionProfileIfNotExists()
 
         protected override void InitializeQosEvent()
         {
+            var commandAlias = this.GetType().GetTypeInfo().GetCustomAttribute<CliCommandAliasAttribute>();
             QosEvent = new AzurePSQoSEvent()
             {
-                CommandName = this.MyInvocation?.MyCommand?.Name,
+                CommandName = commandAlias != null ? "az " + commandAlias.CommandName : this.MyInvocation?.MyCommand?.Name,
                 ModuleName = this.GetType().GetTypeInfo().Assembly.GetName().Name,
                 ModuleVersion = this.GetType().GetTypeInfo().Assembly.GetName().Version.ToString(),
                 ClientRequestId = this._clientRequestId,
@@ -151,7 +154,9 @@ protected override void InitializeQosEvent()
 
             if (this.MyInvocation != null && this.MyInvocation.BoundParameters != null)
             {
-                QosEvent.Parameters = string.Join(",", this.MyInvocation.BoundParameters.Keys);
+                QosEvent.Parameters = string.Join(" ", 
+                    this.MyInvocation.BoundParameters.Keys.Select(
+                        s => string.Format(CultureInfo.InvariantCulture, "--{0} xxx", s.ToLowerInvariant())));
             }
 
             if (this.DefaultProfile?.Context?.Account?.Id != null)

src/CLU/Microsoft.CLU.Run/ConsoleInputOutput.cs

@@ -296,7 +296,6 @@ public void WriteDebugLine(string message)
         /// <param name="message">The message to write</param>
         public void WriteErrorLine(string message)
         {
-            CLUEnvironment.Console.WriteLine(message);
             WriteLine(ConsoleColor.Red, GetConsoleBgColor(), string.Format(Strings.ErrorLineFormat, message));
         }