This commit is contained in:
freddydk 2023-01-18 10:22:52 +01:00
Родитель 3c0e12c12d
Коммит b248f3d14c
2 изменённых файлов: 40 добавлений и 31 удалений

Просмотреть файл

@ -3,6 +3,7 @@ Search for <appid>.disabledTests.json under basefolder in Run-AlPipeline and use
Check whether the app is already installed in Publish-PerTenantExtensionApps
Issue #2849 Issue a warning when trying to create a container with SSL and process isolation on Windows 11
Issue #2848 Run-AlPipeline do not import Test Tool Kits if no appfolders+testfolders are present
Issue #2859 Do not crash if emitting telemetry fails, write instructions instead.
4.0.10
Issue #2842 Problems with 4.0.8 / 4.0.9 and Traefik

Просмотреть файл

@ -246,42 +246,50 @@ function TrackTrace {
$telemetryScope.Properties.Add("duration", [DateTime]::Now.Subtract($telemetryScope.StartTime).TotalSeconds)
if ($telemetry.Assembly -ne $null) {
$printCorrelationId = $telemetry.Debug
"Microsoft","Partner" | ForEach-Object {
$clientName = "$($_)Client"
$extendedTelemetry = $bcContainerHelperConfig.SendExtendedTelemetryToMicrosoft -or $_ -eq "Partner"
if ($telemetry."$clientName") {
$traceTelemetry = $telemetry.Assembly.CreateInstance('Microsoft.ApplicationInsights.DataContracts.TraceTelemetry')
if ($extendedTelemetry) {
$traceTelemetry.Message = "$($telemetryScope.Name)`n$transcript"
$traceTelemetry.SeverityLevel = 0
$telemetryScope.allParameters.GetEnumerator() | ForEach-Object {
[void]$traceTelemetry.Properties.TryAdd("parameter[$($_.Key)]", $_.Value)
try {
$printCorrelationId = $telemetry.Debug
"Microsoft","Partner" | ForEach-Object {
$clientName = "$($_)Client"
$extendedTelemetry = $bcContainerHelperConfig.SendExtendedTelemetryToMicrosoft -or $_ -eq "Partner"
if ($telemetry."$clientName") {
$traceTelemetry = $telemetry.Assembly.CreateInstance('Microsoft.ApplicationInsights.DataContracts.TraceTelemetry')
if ($extendedTelemetry) {
$traceTelemetry.Message = "$($telemetryScope.Name)`n$transcript"
$traceTelemetry.SeverityLevel = 0
$telemetryScope.allParameters.GetEnumerator() | ForEach-Object {
[void]$traceTelemetry.Properties.TryAdd("parameter[$($_.Key)]", $_.Value)
}
}
}
else {
$traceTelemetry.Message = "$($telemetryScope.Name)"
$traceTelemetry.SeverityLevel = 1
$telemetryScope.Parameters.GetEnumerator() | ForEach-Object {
[void]$traceTelemetry.Properties.TryAdd("parameter[$($_.Key)]", $_.Value)
else {
$traceTelemetry.Message = "$($telemetryScope.Name)"
$traceTelemetry.SeverityLevel = 1
$telemetryScope.Parameters.GetEnumerator() | ForEach-Object {
[void]$traceTelemetry.Properties.TryAdd("parameter[$($_.Key)]", $_.Value)
}
}
$telemetryScope.Properties.GetEnumerator() | ForEach-Object {
[void]$traceTelemetry.Properties.TryAdd($_.Key, $_.Value)
}
$traceTelemetry.Context.Operation.Name = $telemetryScope.Name
$traceTelemetry.Context.Operation.Id = $telemetryScope.CorrelationId
$traceTelemetry.Context.Operation.ParentId = $telemetryScope.ParentId
$telemetry."$clientName".TrackTrace($traceTelemetry)
$telemetry."$clientName".Flush()
if ($extendedTelemetry) { $printCorrelationId = $true }
if ($telemetry.Debug) {
Write-Host "$_ telemetry emitted"
}
}
$telemetryScope.Properties.GetEnumerator() | ForEach-Object {
[void]$traceTelemetry.Properties.TryAdd($_.Key, $_.Value)
}
$traceTelemetry.Context.Operation.Name = $telemetryScope.Name
$traceTelemetry.Context.Operation.Id = $telemetryScope.CorrelationId
$traceTelemetry.Context.Operation.ParentId = $telemetryScope.ParentId
$telemetry."$clientName".TrackTrace($traceTelemetry)
$telemetry."$clientName".Flush()
if ($extendedTelemetry) { $printCorrelationId = $true }
if ($telemetry.Debug) {
Write-Host "$_ telemetry emitted"
}
}
if ($printCorrelationId) {
Write-Host "$($telemetryScope.Name) Telemetry Correlation Id: $($telemetryScope.CorrelationId)"
}
}
if ($printCorrelationId) {
Write-Host "$($telemetryScope.Name) Telemetry Correlation Id: $($telemetryScope.CorrelationId)"
catch {
Write-Host -ForegroundColor Red "Error emitting telemetry."
Write-Host -ForegroundColor Red "This might be caused by and old version of the AZ PowerShell module on your system."
Write-Host -ForegroundColor Red "Please upgrade your AZ module to the latest version in order to remove this error."
Write-Host -ForegroundColor Red "If the error persists, please create an issue on https://github.com/microsoft/navcontainerhelper/issues."
}
}
}