Merge pull request Azure#10743 from erich-wang/addSubId

add sub id to client telemetry for az 4.0 preview

Author: msJinLei

src/Accounts/Accounts/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Add client-side telemetry info for Az 4.0 preview
 
 ## Version 1.6.5
 * Update references in .psd1 to use relative path

src/Accounts/Accounts/CommonModule/TelemetryProvider.cs

@@ -33,6 +33,8 @@ namespace Microsoft.Azure.Commands.Common
     /// </summary>
     public class TelemetryProvider : IDictionary<string, AzurePSQoSEvent>, IDisposable
     {
+        const string SubscriptionIdString = "SubscriptionId";
+
         AzurePSDataCollectionProfile _dataCollectionProfile;
         MetricHelper _helper;
         Action<string> _warningLogger, _debugLogger;
@@ -144,6 +146,27 @@ public virtual AzurePSQoSEvent CreateQosEvent(InvocationInfo invocationInfo, str
 
             data.CustomProperties.Add("PSPreviewVersion", "4.0.0");
             data.CustomProperties.Add("UserAgent", "AzurePowershell/Az4.0.0-preview");
+            if(invocationInfo?.BoundParameters?.ContainsKey(SubscriptionIdString) == true)
+            {
+                object rawValue = invocationInfo.BoundParameters[SubscriptionIdString];
+                string subscriptionId = null;
+                if(rawValue is string)
+                {
+                    subscriptionId = rawValue as string;
+                }
+                else if(rawValue is string[])
+                {
+                    string[] rawValueArray = rawValue as string[] ;
+                    if (rawValueArray.Length > 0)
+                    {
+                        subscriptionId = string.Join(";", rawValueArray);
+                    }
+                }
+                if(!string.IsNullOrEmpty(subscriptionId))
+                {
+                    data.CustomProperties.Add(SubscriptionIdString, subscriptionId);
+                }
+            }
 
             if (invocationInfo != null)
             {