set macos conan profile to arm64. fix opentracing shim test script

Author: dbarker

.github/workflows/cmake_install.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   windows_2022_vcpkg:
-    name: Windows 2022 vcpkg (cxx17, static libs only)
+    name: Windows 2022 vcpkg cxx17 (static libs - dll - opentracing shim)
     runs-on: windows-2022
     env:
       CXX_STANDARD: '17'
@@ -23,9 +23,11 @@ jobs:
         run: ./ci/do_ci.ps1 cmake.install.test
       - name: Run DLL Tests
         run: ./ci/do_ci.ps1 cmake.dll.install.test
+      - name: Run OpenTracing Shim Test
+        run: ./ci/do_ci.sh cmake.opentracing_shim.install.test
 
   windows_2019_vcpkg:
-    name: Windows 2019 vcpkg (cxx14, static libs only)
+    name: Windows 2019 vcpkg cxx14 (static libs)
     runs-on: windows-2019
     env:
       CXX_STANDARD: '14'
@@ -37,68 +39,66 @@ jobs:
         run: ./ci/setup_windows_ci_environment.ps1
       - name: Run Tests
         run: ./ci/do_ci.ps1 cmake.install.test
-      - name: Run DLL Tests
-        run: ./ci/do_ci.ps1 cmake.dll.install.test
 
-  ubuntu_2404_src_grpc_1_71_0:
-    name: Ubuntu 24.04 grpc 1.71.0 src (cxx17, static libs only)
+  ubuntu_2404_system_packages:
+    name: Ubuntu 24.04 apt packages cxx17 (static libs - shared libs)
     runs-on: ubuntu-24.04
     env:
       INSTALL_TEST_DIR: '/home/runner/install_test'
-      CXX_STANDARD: '20'
+      CXX_STANDARD: '17'
       BUILD_TYPE: 'Debug'
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - name: Install gtest, libcurl, zlib, nlohmann-json with apt
+    - name: Install libcurl, zlib, nlohmann-json with apt
       run: |
         sudo -E ./ci/setup_googletest.sh
         sudo -E ./ci/setup_ci_environment.sh
-    - name: Build abseil, protobuf, and grpc with ci scripts
-      env:
-        ABSEIL_CPP_VERSION: '20240722.1'
-        PROTOBUF_VERSION: '29.0'
-        GRPC_VERSION: 'v1.71.0'
+    - name: Build abseil, protobuf, and grpc with apt
       run: |
-        sudo -E ./ci/install_abseil.sh
-        sudo -E ./ci/install_protobuf.sh
-        sudo -E ./ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
+        sudo -E apt-get update
+        sudo -E apt-get install -y libabsl-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
     - name: Run Tests (static libs)
       env:
         BUILD_SHARED_LIBS: 'OFF'
       run: ./ci/do_ci.sh cmake.install.test
+    - name: Run Tests (shared libs)
+      env:
+        BUILD_SHARED_LIBS: 'ON'
+      run: ./ci/do_ci.sh cmake.install.test
 
-  ubuntu_2404_system_packages:
-    name: Ubuntu 24.04 with apt packages (cxx17, static and shared libs)
+  ubuntu_2404_script_build_grpc_1_71_0:
+    name: Ubuntu 24.04 script build grpc 1.71.0 cxx17 (static libs)
     runs-on: ubuntu-24.04
     env:
       INSTALL_TEST_DIR: '/home/runner/install_test'
-      CXX_STANDARD: '17'
+      CXX_STANDARD: '20'
       BUILD_TYPE: 'Debug'
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - name: Install libcurl, zlib, nlohmann-json with apt
+    - name: Install gtest, libcurl, zlib, nlohmann-json with apt
       run: |
         sudo -E ./ci/setup_googletest.sh
         sudo -E ./ci/setup_ci_environment.sh
-    - name: Build abseil, protobuf, and grpc with apt
+    - name: Build abseil, protobuf, and grpc with ci scripts
+      env:
+        ABSEIL_CPP_VERSION: '20240722.1'
+        PROTOBUF_VERSION: '29.0'
+        GRPC_VERSION: 'v1.71.0'
       run: |
-        sudo -E apt-get update
-        sudo -E apt-get install -y libabsl-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
+        sudo -E ./ci/install_abseil.sh
+        sudo -E ./ci/install_protobuf.sh
+        sudo -E ./ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
     - name: Run Tests (static libs)
       env:
         BUILD_SHARED_LIBS: 'OFF'
       run: ./ci/do_ci.sh cmake.install.test
-    - name: Run Tests (shared libs)
-      env:
-        BUILD_SHARED_LIBS: 'ON'
-      run: ./ci/do_ci.sh cmake.install.test
 
-  ubuntu_2204_src_grpc_1_55_0:
-    name: Ubuntu 22.04 grpc 1.55.0 src (cxx17, static and shared libs)
+  ubuntu_2204_script_build_grpc_1_55_0:
+    name: Ubuntu 22.04 script_build grpc 1.55.0 cxx17 (static libs - shared libs)
     runs-on: ubuntu-22.04
     env:
       INSTALL_TEST_DIR: '/home/runner/install_test'
@@ -130,8 +130,8 @@ jobs:
         BUILD_SHARED_LIBS: 'ON'
       run: ./ci/do_ci.sh cmake.install.test
 
-  ubuntu_2004_src_grpc_1_49_2:
-    name: Ubuntu 20.04 grpc 1.49.2 src (cxx14, static and shared libs)
+  ubuntu_2004_script_build_grpc_1_49_2:
+    name: Ubuntu 20.04 script build grpc 1.49.2 cxx14 (static libs - shared libs)
     runs-on: ubuntu-20.04
     env:
       INSTALL_TEST_DIR: '/home/runner/install_test'
@@ -164,7 +164,7 @@ jobs:
       run: ./ci/do_ci.sh cmake.install.test
 
   ubuntu_2404_conan_stable:
-    name: Ubuntu 24.04 conanfile_stable (cxx17, static and shared libs)
+    name: Ubuntu 24.04 conanfile_stable cxx17 (static libs - shared libs - opentracing shim)
     runs-on: ubuntu-24.04
     env:
       INSTALL_TEST_DIR: '/home/runner/install_test'
@@ -194,9 +194,11 @@ jobs:
         run: |
           export PKG_CONFIG_PATH=$INSTALL_TEST_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
           ./ci/verify_packages.sh
+      - name: Run OpenTracing Shim Test
+        run: ./ci/do_ci.sh cmake.opentracing_shim.install.test
 
   ubuntu_2404_conan_latest:
-    name: Ubuntu 24.04 conanfile_latest (cxx17, static libs only)
+    name: Ubuntu 24.04 conanfile_latest cxx17 (static libs)
     runs-on: ubuntu-24.04
     env:
       INSTALL_TEST_DIR: '/home/runner/install_test'
@@ -224,7 +226,7 @@ jobs:
           ./ci/verify_packages.sh
 
   macos_14_conan_stable:
-    name: macOS 14 conanfile_stable (cxx17, static and shared libs)
+    name: macOS 14 conanfile_stable cxx17 (static libs - shared libs)
     runs-on: macos-14
     env:
       INSTALL_TEST_DIR: '/Users/runner/install_test'
@@ -240,7 +242,7 @@ jobs:
         brew install conan autoconf automake libtool coreutils
         conan profile detect --force
     - name: Install or build all dependencies with Conan
-      run: conan install install/conan/conanfile_stable.txt --build=missing -of /Users/runner/conan -s build_type=Debug
+      run: conan install install/conan/conanfile_stable.txt --build=missing -of /Users/runner/conan -s build_type=Debug -s arch=arm64
     - name: Run Tests (static libs)
       env:
         BUILD_SHARED_LIBS: 'OFF'
@@ -251,7 +253,7 @@ jobs:
       run: ./ci/do_ci.sh cmake.install.test
 
   macos_14_brew_packages:
-    name: macOS 14 with brew packages (cxx17, static libs only)
+    name: macOS 14 with brew packages cxx17 (static libs)
     runs-on: macos-14
     env:
       CXX_STANDARD: '17'

CMakeLists.txt

@@ -733,7 +733,7 @@ if(CMAKE_TOOLCHAIN_FILE)
   message(STATUS "CMAKE_TOOLCHAIN_FILE: ${CMAKE_TOOLCHAIN_FILE}")
 endif()
 message(STATUS "BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
-message(STATUS "Architecture: ${ARCH}")
+message(STATUS "ARCH: ${ARCH}")
 message(STATUS "---------------------------------------------")
 message(STATUS "Build Options")
 message(STATUS "---------------------------------------------")

ci/do_ci.ps1

@@ -458,7 +458,8 @@ switch ($action) {
   }
   "cmake.dll.install.test" {
     cd "$BUILD_DIR"
-    rm -Recurse -Force "$INSTALL_TEST_DIR\*"
+    Remove-Item -Recurse -Force "$BUILD_DIR\*"
+    Remove-Item -Recurse -Force "$INSTALL_TEST_DIR\*"
 
     $CMAKE_OPTIONS = @(
     "-DCMAKE_CXX_STANDARD=17",
@@ -475,8 +476,20 @@ switch ($action) {
       -DWITH_ABSEIL=OFF `
       -DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON `
       -DWITH_METRICS_EXEMPLAR_PREVIEW=ON `
+      -DWITH_ASYNC_EXPORT_PREVIEW=ON `
       -DWITH_ETW=ON `
-      -DOPENTELEMETRY_INSTALL=ON
+      -DOPENTELEMETRY_INSTALL=ON `
+      -DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=OFF `
+      -DWITH_OTLP_RETRY_PREVIEW=OFF `
+      -DWITH_OTLP_GRPC=OFF `
+      -DWITH_OTLP_HTTP=OFF `
+      -DWITH_OTLP_FILE=OFF `
+      -DWITH_OTLP_HTTP_COMPRESSION=OFF `
+      -DWITH_HTTP_CLIENT_CURL=OFF `
+      -DWITH_PROMETHEUS=OFF `
+      -DWITH_ZIPKIN=OFF `
+      -DWITH_ELASTICSEARCH=OFF `
+      -DWITH_EXAMPLES=OFF `
 
     $exit = $LASTEXITCODE
     if ($exit -ne 0) {

ci/do_ci.sh

@@ -245,6 +245,16 @@ elif [[ "$1" == "cmake.abseil.test" ]]; then
   make test
   exit 0
 elif [[ "$1" == "cmake.opentracing_shim.test" ]]; then
+  cd "${BUILD_DIR}"
+  rm -rf *
+  cmake "${CMAKE_OPTIONS[@]}" \
+        -DCMAKE_CXX_FLAGS="-Werror -Wno-error=redundant-move $CXXFLAGS" \
+        -DWITH_OPENTRACING=ON \
+        "${SRC_DIR}"
+  make -j $(nproc)
+  make test
+  exit 0
+elif [[ "$1" == "cmake.opentracing_shim.install.test" ]]; then
   cd "${BUILD_DIR}"
   rm -rf *
   rm -rf ${INSTALL_TEST_DIR}/*
@@ -262,7 +272,6 @@ elif [[ "$1" == "cmake.opentracing_shim.test" ]]; then
     "api"
     "sdk"
     "ext_common"
-    "ext_http_curl"
     "exporters_in_memory"
     "exporters_ostream"
     "shims_opentracing"
@@ -273,7 +282,7 @@ elif [[ "$1" == "cmake.opentracing_shim.test" ]]; then
         "${CMAKE_OPTIONS[@]}" \
         "-DCMAKE_PREFIX_PATH=${INSTALL_TEST_DIR}" \
         "-DINSTALL_TEST_CMAKE_OPTIONS=${CMAKE_OPTIONS_STRING}" \
-        "-DINSTALL_TEST_COMPONENTS=${EXPECTED_COMPONENTS}"
+        "-DINSTALL_TEST_COMPONENTS=${EXPECTED_COMPONENTS_STRING}"
   ctest --test-dir "${BUILD_DIR}/install_test" --output-on-failure
   exit 0
 elif [[ "$1" == "cmake.c++20.test" ]]; then