Using fallback version of span when std::span do not support range.

Signed-off-by: owent <[email protected]>

.github/workflows/ci.yml

@@ -163,12 +163,18 @@ jobs:
  with:
  submodules: 'recursive'
  - name: setup
+ env:
+ CMAKE_VERSION: "3.20.6"
  run: |
- sudo ./ci/setup_ci_environment.sh
- sudo ./ci/setup_cmake.sh
+ sudo -E ./ci/setup_ci_environment.sh
+ sudo -E ./ci/setup_cmake.sh
  - name: run tests
+ env:
+ CMAKE_VERSION: "3.20.6"
  run: ./ci/do_ci.sh cmake.c++20.test
  - name: run tests (enable stl)
+ env:
+ CMAKE_VERSION: "3.20.6"
  run: ./ci/do_ci.sh cmake.c++20.stl.test
 
  cmake_test_cxx20_clang:
@@ -183,6 +189,7 @@ jobs:
  CC: /usr/bin/clang
  CXX: /usr/bin/clang++
  CXXFLAGS: "-stdlib=libc++"
+ CMAKE_VERSION: "3.20.6"
  run: |
  sudo -E ./ci/setup_ci_environment.sh
  sudo -E ./ci/setup_cmake.sh
@@ -191,12 +198,14 @@ jobs:
  CC: /usr/bin/clang
  CXX: /usr/bin/clang++
  CXXFLAGS: "-stdlib=libc++"
+ CMAKE_VERSION: "3.20.6"
  run: ./ci/do_ci.sh cmake.c++20.test
  - name: run tests (enable stl)
  env:
  CC: /usr/bin/clang
  CXX: /usr/bin/clang++
  CXXFLAGS: "-stdlib=libc++"
+ CMAKE_VERSION: "3.20.6"
  run: ./ci/do_ci.sh cmake.c++20.stl.test
 
  cmake_otprotocol_test:

CHANGELOG.md

@@ -15,7 +15,8 @@ Increment the:
 
 ## [Unreleased]
 
-* [TESTS] Upgrade default version of googletest to 1.12.1 ([#1852](https:/open-telemetry/opentelemetry-cpp/pull/1852))
+* [TESTS] Upgrade default version of googletest to 1.12.1, using cmake 3.20.6
+with C++20 [#1852](https:/open-telemetry/opentelemetry-cpp/pull/1852)
 * [BUILD] Fix OTELCPP_MAINTAINER_MODE [#1844](https:/open-telemetry/opentelemetry-cpp/pull/1844)
 
 ## [1.8.1] 2022-12-04

CMakeLists.txt

@@ -486,7 +486,6 @@ if(BUILD_TESTING)
  endif()
 endif()
 
-include("${CMAKE_CURRENT_LIST_DIR}/cmake/compiler-detection.cmake")
 include(CMakePackageConfigHelpers)
 
 include_directories(api/include)

api/include/opentelemetry/nostd/span.h

@@ -5,7 +5,27 @@
 
 // Try to use either `std::span` or `gsl::span`
 #ifdef HAVE_CPP_STDLIB
-# include "opentelemetry/std/span.h"
+# include <array>
+# include <cstddef>
+# include <iterator>
+# include <type_traits>
+
+/**
+ * @brief Clang 14.0.0 with libc++ do not support implicitly construct a span for a range.We just
+ * use our fallback version.
+ *
+ */
+# if defined(_LIBCPP_VERSION)
+# if _LIBCPP_VERSION <= 14000
+# define OPENTELEMETRY_OPTION_USE_STD_SPAN 0
+# endif
+# endif
+# ifndef OPENTELEMETRY_OPTION_USE_STD_SPAN
+# define OPENTELEMETRY_OPTION_USE_STD_SPAN 1
+# endif
+# if OPENTELEMETRY_OPTION_USE_STD_SPAN
+# include "opentelemetry/std/span.h"
+# endif
 #endif
 
 // Fallback to `nostd::span` if necessary