From 63ac69506facef5fe266fd4f5154e2abaa44d39a Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Wed, 21 May 2025 11:57:28 -0700 Subject: [PATCH] Update vcpkg baseline (#6574) * Update vcpkg baseline * Make code to compile with either newer or older version of opentelemetry-cpp * Clang-format * Suppress otel warnings in stress test code * Update CI to update vcpkg cache if the run is PR-initiated * Turn SSL caching off by default * Make code to compile with either newer or older version of opentelemetry-cpp * Clang-format * Integrate the exact copy of #6581 - to make sure we're testing the same change with libcurl >= 8.12, and also make future merging easier * Update cspell * Move feature to bugfix * Update vcpkg.yml * Copy #6582 to verify against the latest libcurl * Undo unnecessary changes --------- Co-authored-by: Anton Kolesnyk --- cmake-modules/AzureVcpkg.cmake | 2 +- eng/pipelines/templates/steps/vcpkg.yml | 2 +- .../azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp | 2 ++ .../test/eventhubs-stress-test/src/eventhubs_stress_test.cpp | 1 + .../src/scenarios/inc/batch_stress_tests.hpp | 1 + .../src/scenarios/inc/shared_functions.hpp | 1 + vcpkg.json | 2 +- 7 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 85c0a9af2..e1db45d18 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 f0f811770e0538fcb295a1750c0a5e0de5131d29) # default SDK tested commit + set(VCPKG_COMMIT_STRING 2c7705e70dcfb70e5f726459c3e399bd780bc1fc) # 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/pipelines/templates/steps/vcpkg.yml b/eng/pipelines/templates/steps/vcpkg.yml index 925527d69..ea3612f92 100644 --- a/eng/pipelines/templates/steps/vcpkg.yml +++ b/eng/pipelines/templates/steps/vcpkg.yml @@ -12,7 +12,7 @@ steps: ) displayName: vcpkg --version - - ${{if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + - ${{if eq(variables['System.TeamProject'], 'internal') }}: - task: AzurePowerShell@5 displayName: Set Vcpkg Write-mode Cache inputs: diff --git a/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp b/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp index 11ba52d16..5a5bbc3be 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp +++ b/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp @@ -430,6 +430,8 @@ public: */ bool Shutdown(std::chrono::microseconds) noexcept override { return true; } + bool ForceFlush(std::chrono::microseconds) noexcept override { return true; } + private: std::shared_ptr m_testData; }; 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 f2845599e..defe623af 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 @@ -31,6 +31,7 @@ #pragma warning(push) #pragma warning(disable : 4100) #pragma warning(disable : 4244) +#pragma warning(disable : 4996) #pragma warning(disable : 6323) // Disable "Use of arithmetic operator on Boolean type" warning. #endif diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/batch_stress_tests.hpp b/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/batch_stress_tests.hpp index 32f4dd8de..620e9af3f 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/batch_stress_tests.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/batch_stress_tests.hpp @@ -14,6 +14,7 @@ #pragma warning(push) #pragma warning(disable : 4100) #pragma warning(disable : 4244) +#pragma warning(disable : 4996) #pragma warning(disable : 6323) // Disable "Use of arithmetic operator on Boolean type" warning. #endif diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/shared_functions.hpp b/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/shared_functions.hpp index de6bca0f3..a1917a6bf 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/shared_functions.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/shared_functions.hpp @@ -20,6 +20,7 @@ #pragma warning(push) #pragma warning(disable : 4100) #pragma warning(disable : 4244) +#pragma warning(disable : 4996) #pragma warning(disable : 6323) // Disable "Use of arithmetic operator on Boolean type" warning. #endif diff --git a/vcpkg.json b/vcpkg.json index d5017501f..23e6f7cf6 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "f0f811770e0538fcb295a1750c0a5e0de5131d29", + "builtin-baseline": "2c7705e70dcfb70e5f726459c3e399bd780bc1fc", "dependencies": [ { "name": "curl"