diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake
index c32b4c37d9..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 f61a294e765b257926ae9e9d85f96468a0af74e7) # 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/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.
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<opentelemetry::trace::TracerProvider> 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<logs::LoggerProvider> 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);
diff --git a/vcpkg.json b/vcpkg.json
index 5910f916db..a6b6cd1350 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": "5312e9f976e89b256954f571433e34f783dd2d12",
   "dependencies": [
     {
       "name": "curl"