Added az temeletry command and improved telemetry Flushing

Author: stankovski

src/CLU/Commands.Common/MetricHelper.cs

@@ -195,7 +195,7 @@ public static void FlushMetric(bool isTelemetryEnabled)
             {
                 foreach (TelemetryClient client in TelemetryClients)
                 {
-                    client.Flush();
+                    Task.Run(() => client.Flush()).Wait(TimeSpan.FromSeconds(5));
                 }
             }
             catch

src/CLU/Microsoft.Azure.Commands.Profile/Account/AddAzureRmAccount.cs

@@ -38,7 +38,7 @@ public class AddAzureRMAccountCommand : AzureRMCmdlet
         private const string AccessTokenParameterSet = "AccessToken";
         private const string SubscriptionNameParameterSet = "SubscriptionName";
         private const string SubscriptionIdParameterSet = "SubscriptionId";
-        private const string CollectTelemetryEnvironmentVariable = "Azure_PS_Data_Collection";
+        internal const string CollectTelemetryEnvironmentVariable = "Azure_PS_Data_Collection";
 
         public AzureEnvironment Environment { get; set; }
 
@@ -212,13 +212,13 @@ protected override void ProcessRecord()
 
             bool isInteractive = azureAccount.Id == null;
 
+            PromptForDataCollectionProfileIfNotExists(isInteractive);
+
             var profileClient = new RMProfileClient(AuthenticationFactory, ClientFactory, DefaultProfile);
             profileClient.WarningLog = (s) => WriteWarning(s);
-
+            
             WriteObject((PSAzureProfile)profileClient.Login(azureAccount, Environment, TenantId, SubscriptionId,
                 SubscriptionName, password));
-
-            PromptForDataCollectionProfileIfNotExists(isInteractive);
         }
 
         private void PromptForDataCollectionProfileIfNotExists(bool isInteractive)
@@ -236,8 +236,8 @@ private void PromptForDataCollectionProfileIfNotExists(bool isInteractive)
             if (!DefaultProfile.IsTelemetryCollectionEnabled.HasValue && isInteractive)
             {
                 Collection<ChoiceDescription> choices = new Collection<ChoiceDescription>();
-                choices.Add(new ChoiceDescription("Yes", Resources.DataCollectionConfirmYes));
-                choices.Add(new ChoiceDescription("No", Resources.DataCollectionConfirmNo));
+                choices.Add(new ChoiceDescription("&Yes", Resources.DataCollectionConfirmYes));
+                choices.Add(new ChoiceDescription("&No", Resources.DataCollectionConfirmNo));
                 try
                 {
                     int choice = this.Host.UI.PromptForChoice(Resources.DataCollectionActivity, Resources.DataCollectionPrompt, choices, 1);

src/CLU/Microsoft.Azure.Commands.Profile/Microsoft.Azure.Commands.Profile.format.ps1xml

@@ -14,10 +14,14 @@
                 <Label>Context</Label>
                 <Property>Context</Property>
               </ListItem>
-               <ListItem>
+              <ListItem>
                 <Label>Environments</Label>
                 <Property>EnvironmentNames</Property>
               </ListItem>
+              <ListItem>
+                <Label>TelemetryEnabled</Label>
+                <Property>IsTelemetryCollectionEnabled</Property>
+              </ListItem>
            </ListItems>
           </ListEntry>
         </ListEntries>

src/CLU/Microsoft.Azure.Commands.Profile/Properties/Resources.Designer.cs

@@ -142,27 +142,20 @@
     <value>Current tenant with Id '{0}' will be used.</value>
   </data>
   <data name="DataCollectionActivity" xml:space="preserve">
-    <value>Microsoft Azure PowerShell Data Collection Confirmation</value>
+    <value>Microsoft Azure CLU Data Collection Confirmation</value>
   </data>
   <data name="DataCollectionConfirmNo" xml:space="preserve">
-    <value>You choose not to participate in Microsoft Azure PowerShell data collection.</value>
-  </data>
-  <data name="DataCollectionConfirmTime" xml:space="preserve">
-    <value>This confirmation message will be dismissed in '{0}' second(s)...</value>
+    <value>You choose not to participate in Microsoft Azure CLU data collection.</value>
   </data>
   <data name="DataCollectionConfirmYes" xml:space="preserve">
-    <value>You choose to participate in Microsoft Azure PowerShell data collection.</value>
+    <value>You choose to participate in Microsoft Azure CLU data collection.</value>
   </data>
   <data name="DataCollectionPrompt" xml:space="preserve">
-    <value>Microsoft Azure PowerShell collects data about how users use PowerShell cmdlets and some problems they encounter.  Microsoft uses this information to improve our PowerShell cmdlets.  Participation is voluntary and when you choose to participate your device automatically sends information to Microsoft about how you use Azure PowerShell. 
+    <value>Microsoft Azure CLU collects data about how users use CLU commands and some problems they encounter.  Microsoft uses this information to improve our CLU commands.  Participation is voluntary and when you choose to participate your device automatically sends information to Microsoft about how you use Azure CLU. 
 
-If you choose to participate, you can stop at any time by using Azure PowerShell as follows:
-1.	Use the Disable-AzureDataCollection cmdlet to turn the feature Off. The cmdlet can be found in the AzureResourceManager module
-To disable data collection: PS &gt; Disable-AzureDataCollection
+If you choose to participate, you may stop later at any time. To stop participation run `az telemetry --disable`.
 
-If you choose to not participate, you can enable at any time by using Azure PowerShell as follows:
-1.	Use the Enable-AzureDataCollection cmdlet to turn the feature On. The cmdlet can be found in the AzureResourceManager module
-To enable data collection: PS &gt; Enable-AzureDataCollection
+If you choose to not participate, you may start later at any time. To start participation run `az telemetry --enable`.
 
 Select Y to enable data collection [Y/N]:</value>
   </data>

src/CLU/Microsoft.Azure.Commands.Profile/Properties/Resources.resx

@@ -0,0 +1,74 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System.Management.Automation;
+using Microsoft.Azure.Commands.ResourceManager.Common;
+using Microsoft.Azure.Commands.Models;
+
+namespace Microsoft.Azure.Commands.Profile
+{
+    /// <summary>
+    /// Cmdlet to enable or disable telemetry collection.
+    /// </summary>
+    [Cmdlet(VerbsCommon.Set, "AzureTelemetryCollection")]
+    [OutputType(typeof(PSAzureProfile))]
+    [CliCommandAlias("telemetry")]
+    public class SetTelemetryCollectionCommand : AzureRMCmdlet
+    {
+        private const string EnabledParameterSet = "Enable";
+        private const string DisableParameterSet = "Disable";
+
+
+        [Parameter(ParameterSetName = EnabledParameterSet, 
+            Mandatory = true, HelpMessage = "Enable telemetry collection.")]
+        [Alias("e")]
+        public SwitchParameter Enable { get; set; }
+
+        [Parameter(ParameterSetName = DisableParameterSet,
+            Mandatory = true, HelpMessage = "Disable telemetry collection.")]
+        [Alias("d")]
+        public SwitchParameter Disable { get; set; }
+
+        protected override void BeginProcessing()
+        {
+            base.BeginProcessing();
+        }
+
+        protected override void ProcessRecord()
+        {
+            if (Enable.IsPresent)
+            {
+                DefaultProfile.IsTelemetryCollectionEnabled = true;
+            }
+            else if (Disable.IsPresent)
+            {
+                DefaultProfile.IsTelemetryCollectionEnabled = false;
+            }
+
+            var collectTelemetryEnv = System.Environment.GetEnvironmentVariable(AddAzureRMAccountCommand.CollectTelemetryEnvironmentVariable);
+            if (!string.IsNullOrEmpty(collectTelemetryEnv))
+            {
+                bool collectTelemetry = false;
+                if (bool.TryParse(collectTelemetryEnv, out collectTelemetry))
+                {
+                    throw new PSInvalidOperationException(
+                            $"Environment variable '{AddAzureRMAccountCommand.CollectTelemetryEnvironmentVariable}' is already to set to {collectTelemetryEnv}. This environment variable should be removed before executing the command.");
+                }
+            }
+
+            DefaultProfile.Save();
+            WriteObject((PSAzureProfile)DefaultProfile);
+        }        
+    }
+}

src/CLU/Microsoft.Azure.Commands.Profile/Telemetry/SetTelemetryCollectionCommand.cs

@@ -268,7 +268,7 @@ public void Invoke()
             }
             finally
             {
-                _telemetryClient.Flush();
+                Task.Run(() => _telemetryClient.Flush()).Wait(TimeSpan.FromSeconds(5));
             }
         }