Move back to D:\ - also go back to VS2019 compiler

Author: malkia

.bazelrc

@@ -50,8 +50,8 @@ build:windows      --copt="/Zc:strictStrings"      --copt="/Gy"      --copt="-DG
 build:windows --host_copt="/Zc:strictStrings" --host_copt="/Gy" --host_copt="-DGPR_DISABLE_ABSEIL_SYNC"
 build:windows --host_linkopt="shell32.lib" 
 # Requires Visual Studio 2019 Build Tools installed in default location with the latest compiler (14.29.30133) for x64
-build:windows      --action_env=BAZEL_VC_FULL_VERSION=14.42.34433      --action_env=BAZEL_WINSDK_FULL_VERSION=10.0.26100.0
-build:windows --host_action_env=BAZEL_VC_FULL_VERSION=14.42.34433 --host_action_env=BAZEL_WINSDK_FULL_VERSION=10.0.26100.0
+build:windows      --action_env=BAZEL_VC_FULL_VERSION=14.29.30133      --action_env=BAZEL_WINSDK_FULL_VERSION=10.0.26100.0
+build:windows --host_action_env=BAZEL_VC_FULL_VERSION=14.29.30133 --host_action_env=BAZEL_WINSDK_FULL_VERSION=10.0.26100.0
 
 # Set minimum supported C++ version
 build:macos --host_cxxopt=-std=c++17 --cxxopt=-std=c++17

.bazelversion

@@ -1 +1 @@
-8.3.1
+8.4.0rc1

.github/workflows/otel_sdk.yml

@@ -8,6 +8,11 @@ on:
       - "*"
     branches:
       - main
+env:
+  # D: drive used to be disabled for some time (Jul-Aug 2025)
+  # Though it's back, and d:\ seems to be faster than c:\
+  # Note that we mount the d:\d.vhdx under c:\d but it'll still use d:\
+  VHDX_FILE: d:/d.vhdx
 jobs:
   otel_sdk_build:
     name: build otel_sdk
@@ -103,15 +108,15 @@ jobs:
           }
       - uses: actions/cache/restore@v4
         with:
-          path: c:/d.vhdx
+          path: ${{ env.VHDX_FILE }}
           enableCrossOsArchive: true
           key: ${{ runner.os }}-bazel-${{ hashFiles('.bazelversion', '.bazelrc', 'MODULE.bazel', 'MODULE.bazel.lock') }}
           restore-keys: ${{ runner.os }}-bazel-
       - name: mount cache disk
         run: |
           New-Item -Path c:/d -ItemType "directory" -Force -Verbose
-          If (-not(Test-Path c:/d.vhdx)) {
-            $vhd = New-VHD -Path c:/d.vhdx -SizeBytes 137438953472 -Dynamic -LogicalSectorSizeBytes 4096 -PhysicalSectorSizeBytes 4096 -Verbose
+          If (-not(Test-Path ${{ env.VHDX_FILE }})) {
+            $vhd = New-VHD -Path ${{ env.VHDX_FILE }} -SizeBytes 137438953472 -Dynamic -LogicalSectorSizeBytes 4096 -PhysicalSectorSizeBytes 4096 -Verbose
             $vhd
             $mnt = Mount-VHD -Path $vhd.path -NoDriveLetter -Verbose -PassThru | Out-Host
             $mnt
@@ -122,44 +127,44 @@ jobs:
             $part
             $vol = Format-Volume -FileSystem ReFS -Partition $part -Verbose
             $vol
-            Dismount-VHD -Path c:/d.vhdx -Verbose
+            Dismount-VHD -Path ${{ env.VHDX_FILE }} -Verbose
           }
-          $part = Mount-VHD -Path c:/d.vhdx -NoDriveLetter -Verbose -PassThru | Get-Disk | Get-Partition | Where-Object -Not IsHidden
+          $part = Mount-VHD -Path ${{ env.VHDX_FILE }} -NoDriveLetter -Verbose -PassThru | Get-Disk | Get-Partition | Where-Object -Not IsHidden
           $part
           $part | Add-PartitionAccessPath -AccessPath c:/d -Verbose
-          ls c:/d.vhdx
+          ls ${{ env.VHDX_FILE }}
           echo empty > c:\d\empty.txt
           cmd /c "dir c:\d || echo swallowing errors"
-          refsutil dedup c:\d /s
+          rem refsutil dedup c:\d /s
       - name: build minimal otel_sdk
         # On the CI, the github runner does not have constant vs2022 msvc release, but has the same vs2019 (14.29.30133)
+        # echo "build:windows --action_env=BAZEL_VC_FULL_VERSION=14.29.30133" >> ../top.bazelrc
+        # echo "build:windows --host_action_env=BAZEL_VC_FULL_VERSION=14.42.34438" >> ../top.bazelrc
         run: |
-          echo "build:windows --action_env=BAZEL_VC_FULL_VERSION=14.29.30133" >> ../top.bazelrc
-          echo "build:windows --host_action_env=BAZEL_VC_FULL_VERSION=14.42.34438" >> ../top.bazelrc
           echo "common --remote_download_minimal" >> ../top.bazelrc
           echo "build --disk_cache=c:/d" >> ../top.bazelrc
-          echo "common --repository_cache=c:/r" >> ../top.bazelrc
-          echo "startup --output_user_root=c:/b" >> ../top.bazelrc
+          echo "common --repository_cache=d:/r" >> ../top.bazelrc
+          echo "startup --output_user_root=d:/b" >> ../top.bazelrc
           ./otel_sdk_build.cmd minimal
           ./otel_sdk_build.cmd shutdown
       - run: |
           cmd /c "dir c:\ || echo swallowing errors"
           cmd /c "dir d:\ || echo swallowing errors"
           cmd /c "dir c:\d || echo swallowing errors"
-          Dismount-VHD -Path "c:/d.vhdx" -Verbose
-          ls c:/d.vhdx
-          Resize-VHD -Path "c:/d.vhdx" -ToMinimumSize -Verbose -ErrorAction SilentlyContinue
-          ls c:/d.vhdx
+          Dismount-VHD -Path "${{ env.VHDX_FILE }}" -Verbose
+          ls ${{ env.VHDX_FILE }}
+          Resize-VHD -Path "${{ env.VHDX_FILE }}" -ToMinimumSize -Verbose -ErrorAction SilentlyContinue
+          ls ${{ env.VHDX_FILE }}
       - uses: actions/cache/save@v4
         # Don't update cache on releases
         if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
         env:
           ZSTD_CLEVEL: 1 # 1 (fastest) .. 19 (slowest)
         with:
-          path: c:/d.vhdx
+          path: ${{ env.VHDX_FILE }}
           enableCrossOsArchive: true
           key: ${{ runner.os }}-bazel-${{ hashFiles('.bazelversion', '.bazelrc', 'MODULE.bazel', 'MODULE.bazel.lock') }}
-      - run: Mount-VHD -Path "c:/d.vhdx" -NoDriveLetter -Verbose -PassThru | Out-Host
+      - run: Mount-VHD -Path "${{ env.VHDX_FILE }}" -NoDriveLetter -Verbose -PassThru | Out-Host
       - uses: actions/upload-artifact@v4
         with:
           name: tracing-profiles
@@ -172,7 +177,7 @@ jobs:
       - run: ./otel_sdk_build.cmd shutdown
       - run: cmd /c "dir c:\ || echo swallowing errors"
       - run: cmd /c "dir d:\ || echo swallowing errors"
-      - run: ls c:/d.vhdx
+      - run: ls ${{ env.VHDX_FILE }}
       - uses: actions/upload-artifact@v4
         if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
         with:

CMakeLists.txt

@@ -15,7 +15,17 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20.0")
   cmake_policy(SET CMP0117 NEW)
 endif()
 
-project(opentelemetry-cpp)
+set(OPENTELEMETRY_VERSION_NUMBER "1.22.0")
+set(OPENTELEMETRY_VERSION_SUFFIX "")
+set(OPENTELEMETRY_VERSION
+    "${OPENTELEMETRY_VERSION_NUMBER}${OPENTELEMETRY_VERSION_SUFFIX}")
+
+set(OPENTELEMETRY_ABI_VERSION_DEFAULT "1")
+
+project(
+  opentelemetry-cpp
+  VERSION "${OPENTELEMETRY_VERSION_NUMBER}"
+  LANGUAGES CXX)
 
 # Mark variables as used so cmake doesn't complain about them
 mark_as_advanced(CMAKE_TOOLCHAIN_FILE)
@@ -56,9 +66,6 @@ endif()
 option(WITH_ABI_VERSION_1 "ABI version 1" ON)
 option(WITH_ABI_VERSION_2 "EXPERIMENTAL: ABI version 2 preview" OFF)
 
-file(READ "${CMAKE_CURRENT_LIST_DIR}/api/include/opentelemetry/version.h"
-     OPENTELEMETRY_CPP_HEADER_VERSION_H)
-
 #
 # We do not want to have WITH_ABI_VERSION = "1" or "2", and instead prefer two
 # distinct flags, WITH_ABI_VERSION_1 and WITH_ABI_VERSION_2.
@@ -88,31 +95,9 @@ if(WITH_ABI_VERSION_2)
 elseif(WITH_ABI_VERSION_1)
   set(OPENTELEMETRY_ABI_VERSION_NO "1")
 else()
-  if(OPENTELEMETRY_CPP_HEADER_VERSION_H MATCHES
-     "OPENTELEMETRY_ABI_VERSION_NO[ \t\r\n]+\"?([0-9]+)\"?")
-    math(EXPR OPENTELEMETRY_ABI_VERSION_NO ${CMAKE_MATCH_1})
-  else()
-    message(
-      FATAL_ERROR
-        "OPENTELEMETRY_ABI_VERSION_NO not found on ${CMAKE_CURRENT_LIST_DIR}/api/include/opentelemetry/version.h"
-    )
-  endif()
+  set(OPENTELEMETRY_ABI_VERSION_NO "${OPENTELEMETRY_ABI_VERSION_DEFAULT}")
 endif()
 
-message(STATUS "OPENTELEMETRY_ABI_VERSION_NO=${OPENTELEMETRY_ABI_VERSION_NO}")
-
-if(OPENTELEMETRY_CPP_HEADER_VERSION_H MATCHES
-   "OPENTELEMETRY_VERSION[ \t\r\n]+\"?([^\"]+)\"?")
-  set(OPENTELEMETRY_VERSION ${CMAKE_MATCH_1})
-else()
-  message(
-    FATAL_ERROR
-      "OPENTELEMETRY_VERSION not found on ${CMAKE_CURRENT_LIST_DIR}/api/include/opentelemetry/version.h"
-  )
-endif()
-
-message(STATUS "OPENTELEMETRY_VERSION=${OPENTELEMETRY_VERSION}")
-
 option(WITH_NO_DEPRECATED_CODE "Do not include deprecated code" OFF)
 
 set(WITH_STL
@@ -478,7 +463,7 @@ endif()
 message(STATUS "---------------------------------------------")
 message(STATUS "build settings")
 message(STATUS "---------------------------------------------")
-message(STATUS "OpenTelemetry: ${OPENTELEMETRY_VERSION}")
+message(STATUS "OpenTelemetry VERSION: ${OPENTELEMETRY_VERSION}")
 message(STATUS "OpenTelemetry ABI: ${OPENTELEMETRY_ABI_VERSION_NO}")
 message(STATUS "CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
 message(STATUS "CXX: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
@@ -667,3 +652,13 @@ if(OPENTELEMETRY_INSTALL)
     include(CPack)
   endif()
 endif()
+
+# Make the version and ABI version available to the user for in-tree builds
+# These are the same variables that are cached with
+# find_package(opentelemetry-cpp CONFIG)
+set(OPENTELEMETRY_ABI_VERSION_NO
+    "${OPENTELEMETRY_ABI_VERSION_NO}"
+    CACHE STRING "opentelemetry-cpp ABI version" FORCE)
+set(OPENTELEMETRY_VERSION
+    "${OPENTELEMETRY_VERSION}"
+    CACHE STRING "opentelemetry-cpp version" FORCE)

api/include/opentelemetry/common/string_util.h

@@ -3,6 +3,9 @@
 
 #pragma once
 
+#include <ctype.h>
+
+#include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/version.h"
 #include "opentelemetry/nostd/string_view.h"
 

cmake/otel-install-functions.cmake

@@ -487,13 +487,11 @@ function(otel_install_cmake_config)
     "${PROJECT_SOURCE_DIR}/cmake/templates/opentelemetry-cpp-config.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake"
     INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-    PATH_VARS OPENTELEMETRY_ABI_VERSION_NO OPENTELEMETRY_VERSION PROJECT_NAME
-              INCLUDE_INSTALL_DIR CMAKE_INSTALL_LIBDIR)
+    PATH_VARS INCLUDE_INSTALL_DIR CMAKE_INSTALL_LIBDIR)
 
   # Write version file for find_package(opentelemetry-cpp CONFIG)
   write_basic_package_version_file(
     "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config-version.cmake"
-    VERSION ${OPENTELEMETRY_VERSION}
     COMPATIBILITY ExactVersion)
 
   install(

cmake/templates/opentelemetry-cpp-config.cmake.in

@@ -211,10 +211,13 @@ endforeach()
 # handle the QUIETLY and REQUIRED arguments and set opentelemetry-cpp_FOUND to
 # TRUE if all variables listed contain valid results, e.g. valid file paths.
 include("FindPackageHandleStandardArgs")
+
+set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG ${CMAKE_CURRENT_LIST_FILE})
+
 find_package_handle_standard_args(
-  ${CMAKE_FIND_PACKAGE_NAME}
-  FOUND_VAR ${CMAKE_FIND_PACKAGE_NAME}_FOUND
-  REQUIRED_VARS OPENTELEMETRY_CPP_INCLUDE_DIRS OPENTELEMETRY_CPP_LIBRARIES)
+   ${CMAKE_FIND_PACKAGE_NAME}
+   CONFIG_MODE
+   REQUIRED_VARS OPENTELEMETRY_CPP_INCLUDE_DIRS OPENTELEMETRY_CPP_LIBRARIES)
 
 if(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
   set(OPENTELEMETRY_CPP_FOUND

functional/configuration/run_test.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+set -e
+
+# To run tests in a local dev environment:
+# - set BUILD_DIR to the top level build directory,
+
+[ -z "${BUILD_DIR}" ] && export BUILD_DIR="${HOME}/build"
+
+export EXAMPLE_BIN_DIR="${BUILD_DIR}/examples/configuration/"
+
+# Make sure `example_yaml` is in the path
+export PATH=${PATH}:${EXAMPLE_BIN_DIR}
+
+shelltest ./shelltests
+

functional/configuration/shelltests/disabled_empty.test

@@ -0,0 +1,8 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+$ example_yaml --test --yaml shelltests/disabled_empty.yaml
+>
+MODEL PARSED
+SDK CREATED
+>= 0

functional/configuration/shelltests/disabled_empty.yaml

@@ -0,0 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+file_format: 1.0.0
+disabled: