Merge branch 'master' into fix-null-context

erich-wang · web-flow · commit dba983e27439 · 2019-12-03T14:34:52.000+08:00
diff --git a/src/Accounts/Accounts/ChangeLog.md b/src/Accounts/Accounts/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Set correct UserAgent for client-side telemetry for Az 4.0 preview
 * Display user friendly error message when context is null in Az 4.0
 
 ## Version 1.6.4
diff --git a/src/Accounts/Accounts/CommonModule/TelemetryProvider.cs b/src/Accounts/Accounts/CommonModule/TelemetryProvider.cs
@@ -143,6 +143,7 @@ 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 != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ public virtual AzurePSQoSEvent CreateQosEvent(InvocationInfo invocationInfo, str`
`143`	`143`	`};`
`144`	`144`
`145`	`145`	`data.CustomProperties.Add("PSPreviewVersion", "4.0.0");`
	`146`	`+ data.CustomProperties.Add("UserAgent", "AzurePowershell/Az4.0.0-preview");`
`146`	`147`
`147`	`148`	`if (invocationInfo != null)`
`148`	`149`	`{`