merged from upstream, fixed version.h getting included first (except semconv generated files)

Author: malkia

.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)
+  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
@@ -373,4 +372,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/include/opentelemetry/common/macros.h

@@ -196,21 +196,21 @@
 #  define OPENTELEMETRY_MAYBE_UNUSED
 #endif
 
-#ifndef OPENTELEMETRY_RTTI_ENABLED
-#  if defined(__clang__)
-#    if __has_feature(cxx_rtti)
-#      define OPENTELEMETRY_RTTI_ENABLED
-#    endif
-#  elif defined(__GNUG__)
-#    if defined(__GXX_RTTI)
-#      define OPENTELEMETRY_RTTI_ENABLED
-#    endif
-#  elif defined(_MSC_VER)
-#    if defined(_CPPRTTI)
-#      define OPENTELEMETRY_RTTI_ENABLED
-#    endif
-#  endif
-#endif
+// #ifndef OPENTELEMETRY_RTTI_ENABLED
+// #  if defined(__clang__)
+// #    if __has_feature(cxx_rtti)
+// #      define OPENTELEMETRY_RTTI_ENABLED
+// #    endif
+// #  elif defined(__GNUG__)
+// #    if defined(__GXX_RTTI)
+// #      define OPENTELEMETRY_RTTI_ENABLED
+// #    endif
+// #  elif defined(_MSC_VER)
+// #    if defined(_CPPRTTI)
+// #      define OPENTELEMETRY_RTTI_ENABLED
+// #    endif
+// #  endif
+// #endif
 
 #if defined(__cplusplus) && __cplusplus >= 201402L
 #  define OPENTELEMETRY_DEPRECATED [[deprecated]]

api/include/opentelemetry/semconv/azure_metrics.h

@@ -10,9 +10,9 @@
 
 #pragma once
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/common/macros.h"
 #include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace semconv

api/include/opentelemetry/semconv/cicd_metrics.h

@@ -10,9 +10,9 @@
 
 #pragma once
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/common/macros.h"
 #include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace semconv

api/include/opentelemetry/semconv/client_attributes.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "opentelemetry/common/macros.h"
 #include "opentelemetry/version.h"
+#include "opentelemetry/common/macros.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace semconv

api/include/opentelemetry/semconv/code_attributes.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "opentelemetry/common/macros.h"
 #include "opentelemetry/version.h"
+#include "opentelemetry/common/macros.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace semconv

api/include/opentelemetry/semconv/container_metrics.h

@@ -10,9 +10,9 @@
 
 #pragma once
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/common/macros.h"
 #include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace semconv

api/include/opentelemetry/semconv/cpu_metrics.h

@@ -10,9 +10,9 @@
 
 #pragma once
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/common/macros.h"
 #include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace semconv

api/include/opentelemetry/semconv/db_attributes.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "opentelemetry/common/macros.h"
 #include "opentelemetry/version.h"
+#include "opentelemetry/common/macros.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace semconv