From df8b4d261ca0a6d43acf807dc034e96c5480a44a Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Tue, 9 Jul 2024 14:28:50 -0700 Subject: [PATCH 01/18] Update vcpkg SHA --- cmake-modules/AzureVcpkg.cmake | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index c32b4c37d9..c8e7396381 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -18,7 +18,7 @@ macro(az_vcpkg_integrate) message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.") # GET VCPKG FROM SOURCE # User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch - set(VCPKG_COMMIT_STRING f61a294e765b257926ae9e9d85f96468a0af74e7) # default SDK tested commit + set(VCPKG_COMMIT_STRING 73e9c8e73fbebbfecea912efbda2ec6475134dd1) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.") set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit diff --git a/vcpkg.json b/vcpkg.json index 5910f916db..737d0181a6 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7", + "builtin-baseline": "73e9c8e73fbebbfecea912efbda2ec6475134dd1", "dependencies": [ { "name": "curl" From 8cc8640e3764eaea97bd48d402948cf79ec76642 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Tue, 9 Jul 2024 17:59:11 -0700 Subject: [PATCH 02/18] Show-FailureLogs to show detailed logs --- eng/scripts/Show-FailureLogs.ps1 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/eng/scripts/Show-FailureLogs.ps1 b/eng/scripts/Show-FailureLogs.ps1 index 5d88263315..edc485bbd7 100644 --- a/eng/scripts/Show-FailureLogs.ps1 +++ b/eng/scripts/Show-FailureLogs.ps1 @@ -15,14 +15,25 @@ if (!$filteredLogs) { exit 0 } -foreach ($logFile in $filteredLogs) +$filteredLogs = $filteredLogs | select FullName + +for ($i = 0; $i -lt $filteredLogs.Length; $i += 1) { + $logFile = $filteredLogs[$i] + Write-Host "//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////" Write-Host "==============================================================================================================================" Write-Host "Log file: $logFile" Write-Host "==============================================================================================================================" try { Get-Content $logFile | Write-Host + + $rawContents = Get-Content $logFile -Raw + $regexMatches = Select-String "See logs for more information\:\s*(\r|\n|\r\n|\n\r)(\s+(?\S*)\s*(\r|\n|\r\n|\n\r))+" -input $logFile -AllMatches + foreach ($furtherDetails in $regexMatches.matches.groups.Where({ $_.Name -eq "logFilePath" })) + { + $filteredLogs += $furtherDetails.Value + } } catch { Write-Host "Could not locate file found using Get-ChildItem $logFile" } From 75e289c5a089624a66d1856d19dbc45bfadfaac5 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Tue, 9 Jul 2024 18:12:58 -0700 Subject: [PATCH 03/18] Some protections --- eng/scripts/Show-FailureLogs.ps1 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eng/scripts/Show-FailureLogs.ps1 b/eng/scripts/Show-FailureLogs.ps1 index edc485bbd7..c4814d683f 100644 --- a/eng/scripts/Show-FailureLogs.ps1 +++ b/eng/scripts/Show-FailureLogs.ps1 @@ -6,7 +6,8 @@ # sensitive information. $logFiles = Get-ChildItem -Recurse -Filter *.log -$filteredLogs = $logFiles.Where({ $_.Name -in ('vcpkg-bootstrap.log', 'vcpkg-manifest-install.log') }) +$vcpkgLogFileNames = ('vcpkg-bootstrap.log', 'vcpkg-manifest-install.log') +$filteredLogs = $logFiles.Where({ $_.Name -in $vcpkgLogFileNames }) $filteredLogs.FullName | Write-Host @@ -28,11 +29,14 @@ for ($i = 0; $i -lt $filteredLogs.Length; $i += 1) try { Get-Content $logFile | Write-Host - $rawContents = Get-Content $logFile -Raw - $regexMatches = Select-String "See logs for more information\:\s*(\r|\n|\r\n|\n\r)(\s+(?\S*)\s*(\r|\n|\r\n|\n\r))+" -input $logFile -AllMatches - foreach ($furtherDetails in $regexMatches.matches.groups.Where({ $_.Name -eq "logFilePath" })) + if ($i -lt $vcpkgLogFileNames.Length) { - $filteredLogs += $furtherDetails.Value + $rawContents = Get-Content $logFile -Raw + $regexMatches = Select-String "See logs for more information\:\s*(\r|\n|\r\n|\n\r)(\s+(?\S*)\s*(\r|\n|\r\n|\n\r))+" -input $logFile -AllMatches + foreach ($furtherDetails in $regexMatches.matches.groups.Where({ $_.Name -eq "logFilePath" })) + { + $filteredLogs += $furtherDetails.Value + } } } catch { Write-Host "Could not locate file found using Get-ChildItem $logFile" From 195c621de41a0afae370e11217adf95ac878d4f2 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Tue, 9 Jul 2024 20:48:05 -0700 Subject: [PATCH 04/18] Temporarily add diagnostics --- eng/scripts/Show-FailureLogs.ps1 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/eng/scripts/Show-FailureLogs.ps1 b/eng/scripts/Show-FailureLogs.ps1 index c4814d683f..69d12aae72 100644 --- a/eng/scripts/Show-FailureLogs.ps1 +++ b/eng/scripts/Show-FailureLogs.ps1 @@ -29,12 +29,21 @@ for ($i = 0; $i -lt $filteredLogs.Length; $i += 1) try { Get-Content $logFile | Write-Host + Write-Host "i =" $i + Write-Host "vcpkgLogFileNames.Length =" $vcpkgLogFileNames.Length if ($i -lt $vcpkgLogFileNames.Length) { $rawContents = Get-Content $logFile -Raw $regexMatches = Select-String "See logs for more information\:\s*(\r|\n|\r\n|\n\r)(\s+(?\S*)\s*(\r|\n|\r\n|\n\r))+" -input $logFile -AllMatches + Write-Host "regexMatches.matches.groups.Length =" $regexMatches.matches.groups.Length + Write-Host "---" + Write-Host "---" + Write-Host $regexMatches.matches.groups + Write-Host "---" + Write-Host "---" foreach ($furtherDetails in $regexMatches.matches.groups.Where({ $_.Name -eq "logFilePath" })) { + Write-Host "furtherDetails.Value = " $furtherDetails.Value $filteredLogs += $furtherDetails.Value } } From ed4a33e0a15dd35ec82a85f41ba30ffb9300da59 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Tue, 9 Jul 2024 22:43:12 -0700 Subject: [PATCH 05/18] foreach --- eng/scripts/Show-FailureLogs.ps1 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/eng/scripts/Show-FailureLogs.ps1 b/eng/scripts/Show-FailureLogs.ps1 index 69d12aae72..5eb333ee8a 100644 --- a/eng/scripts/Show-FailureLogs.ps1 +++ b/eng/scripts/Show-FailureLogs.ps1 @@ -16,7 +16,7 @@ if (!$filteredLogs) { exit 0 } -$filteredLogs = $filteredLogs | select FullName +$filteredLogs = $filteredLogs | foreach {$_.FullName} for ($i = 0; $i -lt $filteredLogs.Length; $i += 1) { @@ -29,21 +29,12 @@ for ($i = 0; $i -lt $filteredLogs.Length; $i += 1) try { Get-Content $logFile | Write-Host - Write-Host "i =" $i - Write-Host "vcpkgLogFileNames.Length =" $vcpkgLogFileNames.Length if ($i -lt $vcpkgLogFileNames.Length) { $rawContents = Get-Content $logFile -Raw $regexMatches = Select-String "See logs for more information\:\s*(\r|\n|\r\n|\n\r)(\s+(?\S*)\s*(\r|\n|\r\n|\n\r))+" -input $logFile -AllMatches - Write-Host "regexMatches.matches.groups.Length =" $regexMatches.matches.groups.Length - Write-Host "---" - Write-Host "---" - Write-Host $regexMatches.matches.groups - Write-Host "---" - Write-Host "---" foreach ($furtherDetails in $regexMatches.matches.groups.Where({ $_.Name -eq "logFilePath" })) { - Write-Host "furtherDetails.Value = " $furtherDetails.Value $filteredLogs += $furtherDetails.Value } } From d0047b3bdc8bb855589a299be23fc209721529fd Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Tue, 9 Jul 2024 23:10:39 -0700 Subject: [PATCH 06/18] variable fix --- eng/scripts/Show-FailureLogs.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/scripts/Show-FailureLogs.ps1 b/eng/scripts/Show-FailureLogs.ps1 index 5eb333ee8a..4d57ebf950 100644 --- a/eng/scripts/Show-FailureLogs.ps1 +++ b/eng/scripts/Show-FailureLogs.ps1 @@ -32,10 +32,10 @@ for ($i = 0; $i -lt $filteredLogs.Length; $i += 1) if ($i -lt $vcpkgLogFileNames.Length) { $rawContents = Get-Content $logFile -Raw - $regexMatches = Select-String "See logs for more information\:\s*(\r|\n|\r\n|\n\r)(\s+(?\S*)\s*(\r|\n|\r\n|\n\r))+" -input $logFile -AllMatches - foreach ($furtherDetails in $regexMatches.matches.groups.Where({ $_.Name -eq "logFilePath" })) + $regexMatches = Select-String "See logs for more information\:\s*(\r|\n|\r\n|\n\r)(\s+(?\S*)\s*(\r|\n|\r\n|\n\r))+" -input $rawContents -AllMatches + foreach ($additionalLogFile in $regexMatches.matches.groups.Where({ $_.Name -eq "logFilePath" })) { - $filteredLogs += $furtherDetails.Value + $filteredLogs += $additionalLogFile.Value } } } catch { From 817d08453fb9a9624cd967f6415c4f912499b361 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 10 Jul 2024 01:02:07 -0700 Subject: [PATCH 07/18] No otel default features --- sdk/core/azure-core-tracing-opentelemetry/vcpkg.json | 5 ++++- sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json b/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json index e79bbd4c31..c4a7c5c5ac 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json +++ b/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json @@ -4,7 +4,10 @@ "supports": "!(windows & !static)", "dependencies": [ "azure-core-cpp", - "opentelemetry-cpp", + { + "name": "opentelemetry-cpp", + "default-features": false + } { "name": "vcpkg-cmake", "host": true diff --git a/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json b/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json index 0cdf12968e..f6d38c3211 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json +++ b/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json @@ -23,6 +23,7 @@ }, { "name": "opentelemetry-cpp", + "default-features": false, "version>=": "1.3.0" }, { From f548c7383c9525d745d103a4750adcb112796207 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 10 Jul 2024 01:08:28 -0700 Subject: [PATCH 08/18] , --- sdk/core/azure-core-tracing-opentelemetry/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json b/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json index c4a7c5c5ac..51342620b2 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json +++ b/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json @@ -7,7 +7,7 @@ { "name": "opentelemetry-cpp", "default-features": false - } + }, { "name": "vcpkg-cmake", "host": true From 0241ae78cfbedaef573d1cadcd6429c6eb2c20b9 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 10 Jul 2024 11:32:07 -0700 Subject: [PATCH 09/18] Try new SHA --- cmake-modules/AzureVcpkg.cmake | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index c8e7396381..ba7c5040a8 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -18,7 +18,7 @@ macro(az_vcpkg_integrate) message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.") # GET VCPKG FROM SOURCE # User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch - set(VCPKG_COMMIT_STRING 73e9c8e73fbebbfecea912efbda2ec6475134dd1) # default SDK tested commit + set(VCPKG_COMMIT_STRING 230d85084ca006926d51c3d332c94298fb3bd56c) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.") set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit diff --git a/vcpkg.json b/vcpkg.json index 737d0181a6..a80e54d551 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "73e9c8e73fbebbfecea912efbda2ec6475134dd1", + "builtin-baseline": "230d85084ca006926d51c3d332c94298fb3bd56c", "dependencies": [ { "name": "curl" From ab75298aa9b6889463aa2e802fce05293272d354 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 10 Jul 2024 16:16:02 -0700 Subject: [PATCH 10/18] Use vcpkg SHA 576379156e82da642f8d1834220876759f13534d --- cmake-modules/AzureVcpkg.cmake | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index ba7c5040a8..e148716e08 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -18,7 +18,7 @@ macro(az_vcpkg_integrate) message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.") # GET VCPKG FROM SOURCE # User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch - set(VCPKG_COMMIT_STRING 230d85084ca006926d51c3d332c94298fb3bd56c) # default SDK tested commit + set(VCPKG_COMMIT_STRING 576379156e82da642f8d1834220876759f13534d) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.") set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit diff --git a/vcpkg.json b/vcpkg.json index a80e54d551..97b57241cf 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "230d85084ca006926d51c3d332c94298fb3bd56c", + "builtin-baseline": "576379156e82da642f8d1834220876759f13534d", "dependencies": [ { "name": "curl" From 36ae016a79d1167c6e916f032ab473a71387282c Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 10 Jul 2024 20:39:37 -0700 Subject: [PATCH 11/18] Try on an older 1ES image --- eng/pipelines/templates/stages/archetype-cpp-release.yml | 8 ++++---- eng/pipelines/templates/stages/archetype-sdk-client.yml | 2 +- eng/pipelines/templates/variables/image.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-cpp-release.yml b/eng/pipelines/templates/stages/archetype-cpp-release.yml index 4ed89f9501..5f1493a6d8 100644 --- a/eng/pipelines/templates/stages/archetype-cpp-release.yml +++ b/eng/pipelines/templates/stages/archetype-cpp-release.yml @@ -24,7 +24,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + image: azsdk-pool-mms-win-2022-1espt-118-0-0 os: windows strategy: @@ -66,7 +66,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + image: azsdk-pool-mms-win-2022-1espt-118-0-0 os: windows strategy: @@ -96,7 +96,7 @@ stages: dependsOn: TagRepository pool: name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + image: azsdk-pool-mms-win-2022-1espt-118-0-0 os: windows variables: @@ -237,7 +237,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + image: azsdk-pool-mms-win-2022-1espt-118-0-0 os: windows strategy: diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 18679cb089..010fae0fb4 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -108,7 +108,7 @@ extends: sdl: sourceAnalysisPool: name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + image: azsdk-pool-mms-win-2022-1espt-118-0-0 os: windows eslint: enabled: false diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml index 18da7ab0df..497448c2fd 100644 --- a/eng/pipelines/templates/variables/image.yml +++ b/eng/pipelines/templates/variables/image.yml @@ -17,7 +17,7 @@ variables: - name: LINUXNEXTVMIMAGE value: azsdk-pool-mms-ubuntu-2204-1espt - name: WINDOWSVMIMAGE - value: azsdk-pool-mms-win-2022-1espt + value: azsdk-pool-mms-win-2022-1espt-118-0-0 - name: WINDOWSPREVIOUSVMIMAGE value: azsdk-pool-mms-win-2019-1espt - name: MACVMIMAGE From b9580d8c5c44fe4e700fcbfec259f44c9adc5430 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 10 Jul 2024 21:24:18 -0700 Subject: [PATCH 12/18] Try with the previous vcpkg SHA from April 23rd --- cmake-modules/AzureVcpkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index e148716e08..fdac9519d8 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -18,7 +18,7 @@ macro(az_vcpkg_integrate) message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.") # GET VCPKG FROM SOURCE # User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch - set(VCPKG_COMMIT_STRING 576379156e82da642f8d1834220876759f13534d) # default SDK tested commit + set(VCPKG_COMMIT_STRING 9854d1d92200d81dde189e53b64c9ba6a305dc9f) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.") set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit From 8f127b6f0235393a83ab8495a681e08e283484f8 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 10 Jul 2024 22:48:48 -0700 Subject: [PATCH 13/18] Try newest SHA --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index 97b57241cf..ab98038602 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "576379156e82da642f8d1834220876759f13534d", + "builtin-baseline": "3d72d8c930e1b6a1b2432b262c61af7d3287dcd0", "dependencies": [ { "name": "curl" From dd2a102c08b10111e9f5aa2c5e63730dd878c3db Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 10 Jul 2024 23:15:40 -0700 Subject: [PATCH 14/18] Try newest SHA --- cmake-modules/AzureVcpkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index fdac9519d8..a31463eaf2 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -18,7 +18,7 @@ macro(az_vcpkg_integrate) message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.") # GET VCPKG FROM SOURCE # User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch - set(VCPKG_COMMIT_STRING 9854d1d92200d81dde189e53b64c9ba6a305dc9f) # default SDK tested commit + set(VCPKG_COMMIT_STRING 3d72d8c930e1b6a1b2432b262c61af7d3287dcd0) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.") set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit From 70a6f9a21f43058775ba9ee4bd1cd0b387e7d528 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Thu, 11 Jul 2024 02:14:10 -0700 Subject: [PATCH 15/18] Roll forward to current Windows CI image --- eng/pipelines/templates/stages/archetype-cpp-release.yml | 8 ++++---- eng/pipelines/templates/stages/archetype-sdk-client.yml | 2 +- eng/pipelines/templates/variables/image.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-cpp-release.yml b/eng/pipelines/templates/stages/archetype-cpp-release.yml index 5f1493a6d8..4ed89f9501 100644 --- a/eng/pipelines/templates/stages/archetype-cpp-release.yml +++ b/eng/pipelines/templates/stages/archetype-cpp-release.yml @@ -24,7 +24,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt-118-0-0 + image: azsdk-pool-mms-win-2022-1espt os: windows strategy: @@ -66,7 +66,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt-118-0-0 + image: azsdk-pool-mms-win-2022-1espt os: windows strategy: @@ -96,7 +96,7 @@ stages: dependsOn: TagRepository pool: name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt-118-0-0 + image: azsdk-pool-mms-win-2022-1espt os: windows variables: @@ -237,7 +237,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt-118-0-0 + image: azsdk-pool-mms-win-2022-1espt os: windows strategy: diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 010fae0fb4..18679cb089 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -108,7 +108,7 @@ extends: sdl: sourceAnalysisPool: name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt-118-0-0 + image: azsdk-pool-mms-win-2022-1espt os: windows eslint: enabled: false diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml index 497448c2fd..18da7ab0df 100644 --- a/eng/pipelines/templates/variables/image.yml +++ b/eng/pipelines/templates/variables/image.yml @@ -17,7 +17,7 @@ variables: - name: LINUXNEXTVMIMAGE value: azsdk-pool-mms-ubuntu-2204-1espt - name: WINDOWSVMIMAGE - value: azsdk-pool-mms-win-2022-1espt-118-0-0 + value: azsdk-pool-mms-win-2022-1espt - name: WINDOWSPREVIOUSVMIMAGE value: azsdk-pool-mms-win-2019-1espt - name: MACVMIMAGE From fc78020c71ae92686d8c763244554603d32c8341 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Thu, 11 Jul 2024 10:17:13 -0700 Subject: [PATCH 16/18] Update SHA to the fix, undo other changes --- cmake-modules/AzureVcpkg.cmake | 2 +- eng/scripts/Show-FailureLogs.ps1 | 19 ++----------------- .../vcpkg.json | 5 +---- .../vcpkg/vcpkg.json | 1 - vcpkg.json | 2 +- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index a31463eaf2..6c9e1dedf1 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -18,7 +18,7 @@ macro(az_vcpkg_integrate) message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.") # GET VCPKG FROM SOURCE # User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch - set(VCPKG_COMMIT_STRING 3d72d8c930e1b6a1b2432b262c61af7d3287dcd0) # default SDK tested commit + set(VCPKG_COMMIT_STRING 5312e9f976e89b256954f571433e34f783dd2d12) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.") set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit diff --git a/eng/scripts/Show-FailureLogs.ps1 b/eng/scripts/Show-FailureLogs.ps1 index 4d57ebf950..5d88263315 100644 --- a/eng/scripts/Show-FailureLogs.ps1 +++ b/eng/scripts/Show-FailureLogs.ps1 @@ -6,8 +6,7 @@ # sensitive information. $logFiles = Get-ChildItem -Recurse -Filter *.log -$vcpkgLogFileNames = ('vcpkg-bootstrap.log', 'vcpkg-manifest-install.log') -$filteredLogs = $logFiles.Where({ $_.Name -in $vcpkgLogFileNames }) +$filteredLogs = $logFiles.Where({ $_.Name -in ('vcpkg-bootstrap.log', 'vcpkg-manifest-install.log') }) $filteredLogs.FullName | Write-Host @@ -16,28 +15,14 @@ if (!$filteredLogs) { exit 0 } -$filteredLogs = $filteredLogs | foreach {$_.FullName} - -for ($i = 0; $i -lt $filteredLogs.Length; $i += 1) +foreach ($logFile in $filteredLogs) { - $logFile = $filteredLogs[$i] - Write-Host "//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////" Write-Host "==============================================================================================================================" Write-Host "Log file: $logFile" Write-Host "==============================================================================================================================" try { Get-Content $logFile | Write-Host - - if ($i -lt $vcpkgLogFileNames.Length) - { - $rawContents = Get-Content $logFile -Raw - $regexMatches = Select-String "See logs for more information\:\s*(\r|\n|\r\n|\n\r)(\s+(?\S*)\s*(\r|\n|\r\n|\n\r))+" -input $rawContents -AllMatches - foreach ($additionalLogFile in $regexMatches.matches.groups.Where({ $_.Name -eq "logFilePath" })) - { - $filteredLogs += $additionalLogFile.Value - } - } } catch { Write-Host "Could not locate file found using Get-ChildItem $logFile" } diff --git a/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json b/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json index 51342620b2..e79bbd4c31 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json +++ b/sdk/core/azure-core-tracing-opentelemetry/vcpkg.json @@ -4,10 +4,7 @@ "supports": "!(windows & !static)", "dependencies": [ "azure-core-cpp", - { - "name": "opentelemetry-cpp", - "default-features": false - }, + "opentelemetry-cpp", { "name": "vcpkg-cmake", "host": true diff --git a/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json b/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json index f6d38c3211..0cdf12968e 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json +++ b/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json @@ -23,7 +23,6 @@ }, { "name": "opentelemetry-cpp", - "default-features": false, "version>=": "1.3.0" }, { diff --git a/vcpkg.json b/vcpkg.json index ab98038602..a6b6cd1350 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "3d72d8c930e1b6a1b2432b262c61af7d3287dcd0", + "builtin-baseline": "5312e9f976e89b256954f571433e34f783dd2d12", "dependencies": [ { "name": "curl" From 18b741dd3e896b9c7e780c9f4c93fb6f53b65672 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Thu, 11 Jul 2024 12:30:44 -0700 Subject: [PATCH 17/18] Suppress deprecated warning --- .../src/eventhubs_stress_test.cpp | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/eventhubs_stress_test.cpp b/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/eventhubs_stress_test.cpp index d43fd9af20..f2845599e7 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/eventhubs_stress_test.cpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/eventhubs_stress_test.cpp @@ -90,8 +90,28 @@ void InitTracer(const std::string& stressScenarioName) auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter)); auto resource{GetTraceResource(stressScenarioName)}; + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + // https://github.com/Azure/azure-sdk-for-cpp/issues/5784 + std::shared_ptr provider = trace_sdk::TracerProviderFactory::Create(std::move(processor), std::move(resource)); +#ifdef _MSC_VER +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif // Set the global trace provider trace::Provider::SetTracerProvider(provider); @@ -181,8 +201,27 @@ void InitLogger(const std::string& stressScenarioName) auto resource{GetTraceResource(stressScenarioName)}; +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + // https://github.com/Azure/azure-sdk-for-cpp/issues/5784 + std::shared_ptr provider = logs_sdk::LoggerProviderFactory::Create(std::move(processor), std::move(resource)); +#ifdef _MSC_VER +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif // Set the global log provider. logs::Provider::SetLoggerProvider(provider); From 6da6cbbe7e5c1faac66f654960b0ee85c63db20b Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Thu, 11 Jul 2024 12:55:54 -0700 Subject: [PATCH 18/18] error: returning address of local temporary object --- sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry.cpp b/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry.cpp index bf88940bc8..7a9854bfa6 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry.cpp +++ b/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry.cpp @@ -232,7 +232,7 @@ namespace Azure { namespace Core { namespace Tracing { namespace OpenTelemetry { { return header.Value(); } - return std::string(); + return {}; } /** @brief Sets the value of an HTTP header in the request.