Merge branch 'main' into link_problems_of_grpc

Author: owent

.github/workflows/ci.yml

@@ -1002,7 +1002,7 @@ jobs:
 
   windows:
     name: CMake -> exporter proto
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: Harden the runner (Audit all outbound calls)
       uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1024,7 +1024,7 @@ jobs:
 
   windows-build-dll:
     name: CMake -> exporter proto (Build as DLL)
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: Harden the runner (Audit all outbound calls)
       uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1048,7 +1048,7 @@ jobs:
 
   windows_with_async_export:
     name: CMake (With async export) -> exporter proto
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: Harden the runner (Audit all outbound calls)
       uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1070,7 +1070,7 @@ jobs:
 
   windows_bazel:
     name: Bazel Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: Harden the runner (Audit all outbound calls)
       uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1088,7 +1088,7 @@ jobs:
 
   windows_plugin_test:
     name: Plugin -> CMake Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: Harden the runner (Audit all outbound calls)
       uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0

.github/workflows/cmake_install.yml

@@ -37,14 +37,13 @@ jobs:
       - name: Run DLL Tests
         run: ./ci/do_ci.ps1 cmake.dll.install.test
 
-  windows_2019_vcpkg_submodule_min_cmake:
-    name: Windows 2019 vcpkg submodule versions minimum cmake cxx14 (static libs)
-    runs-on: windows-2019
+  windows_2025_vcpkg_submodule:
+    name: Windows 2025 vcpkg submodule versions cxx20 (static libs)
+    runs-on: windows-2025
     env:
-      # cmake 3.15 is the minimum for windows builds (See https://github.com/open-telemetry/opentelemetry-cpp/pull/3349#discussion_r2030319430)
-      CMAKE_VERSION: '3.15.0'
-      # cxx14 is the default for windows-2019
-      CXX_STANDARD: '14'
+      # Set to the latest version of cmake 3.x
+      CMAKE_VERSION: '3.31.6'
+      CXX_STANDARD: '20'
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -411,4 +410,4 @@ jobs:
     - name: Run Tests (static libs)
       env:
         BUILD_SHARED_LIBS: 'OFF'
-      run: ./ci/do_ci.sh cmake.install.test
+      run: ./ci/do_ci.sh cmake.install.test

.github/workflows/iwyu.yml

@@ -87,7 +87,7 @@ jobs:
           readonly WARNING_COUNT=`grep -c "include-what-you-use reported diagnostics:" iwyu.log`
           echo "include-what-you-use reported ${WARNING_COUNT} warning(s)"
           # Acceptable limit, to decrease over time down to 0
-          readonly WARNING_LIMIT=122
+          readonly WARNING_LIMIT=0
           # FAIL the build if WARNING_COUNT > WARNING_LIMIT
           if [ $WARNING_COUNT -gt $WARNING_LIMIT ] ; then
             exit 1

api/test/common/spinlock_benchmark.cc

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <benchmark/benchmark.h>
-#include <algorithm>
 #include <atomic>
 #include <cstdint>
 #include <thread>

api/test/common/string_util_test.cc

@@ -5,6 +5,7 @@
 #include <string.h>
 
 #include <opentelemetry/common/string_util.h>
+#include "opentelemetry/nostd/string_view.h"
 
 // ------------------------- StringUtil class tests ---------------------------------
 

api/test/context/context_test.cc

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <map>
 #include <string>
+#include <utility>
 
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/context/context_value.h"

api/test/context/propagation/composite_propagator_test.cc

@@ -3,7 +3,6 @@
 
 #include <gtest/gtest.h>
 #include <stdint.h>
-#include <algorithm>
 #include <map>
 #include <string>
 #include <utility>

api/test/logs/logger_benchmark.cc

@@ -3,7 +3,6 @@
 
 #include <benchmark/benchmark.h>
 #include <stdint.h>
-#include <algorithm>
 #include <condition_variable>
 #include <cstddef>
 #include <functional>

api/test/plugin/dynamic_load_test.cc

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
+#include <memory>
 #include <string>
 
 #include "opentelemetry/plugin/dynamic_load.h"

api/test/singleton/component_a.cc

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/scope.h"
 #include "opentelemetry/trace/tracer.h"