Merge remote-tracking branch 'origin/main' into feature_add_cmake_package_components

Author: dbarker

.github/workflows/ci.yml

@@ -301,21 +301,21 @@ jobs:
       run: |
         ./ci/do_ci.sh cmake.with_async_export.test
 
-  cmake_abseil_stl_test:
-    name: CMake test (with abseil)
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo -E ./ci/setup_googletest.sh
-        sudo -E ./ci/setup_ci_environment.sh
-    - name: run cmake tests (enable abseil-cpp)
-      run: |
-        sudo ./ci/install_abseil.sh
-        ./ci/do_ci.sh cmake.abseil.test
+#  cmake_abseil_stl_test:
+#    name: CMake test (with abseil)
+#    runs-on: ubuntu-20.04
+#    steps:
+#    - uses: actions/checkout@v4
+#      with:
+#        submodules: 'recursive'
+#    - name: setup
+#      run: |
+#        sudo -E ./ci/setup_googletest.sh
+#        sudo -E ./ci/setup_ci_environment.sh
+#    - name: run cmake tests (enable abseil-cpp)
+#      run: |
+#        sudo ./ci/install_abseil.sh
+#        ./ci/do_ci.sh cmake.abseil.test
 
   cmake_opentracing_shim_test:
     name: CMake test (with opentracing-shim)
@@ -333,7 +333,7 @@ jobs:
 
   cmake_test_cxx14_gcc:
     name: CMake C++14 test(GCC)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -349,7 +349,7 @@ jobs:
 
   cmake_test_cxx17_gcc:
     name: CMake C++17 test(GCC)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -365,7 +365,7 @@ jobs:
 
   cmake_test_cxx20_gcc:
     name: CMake C++20 test(GCC)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -465,7 +465,7 @@ jobs:
 
   cmake_otprotocol_test:
     name: CMake test (with otlp-exporter)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -515,7 +515,7 @@ jobs:
 
   cmake_do_not_install_test:
     name: CMake do not install test (with otlp-exporter)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -531,7 +531,7 @@ jobs:
 
   cmake_otprotocol_shared_libs_with_static_grpc_test:
     name: CMake test (build shared libraries with otlp-exporter and static gRPC)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -790,7 +790,7 @@ jobs:
 
   copyright:
     name: Copyright
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: check copyright

README.md

@@ -95,7 +95,9 @@ For edit access, get in touch on
 [Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
 ([@open-telemetry/cpp-approvers](https://github.com/orgs/open-telemetry/teams/cpp-approvers)):
 
+* [Doug Barker](https://github.com/dbarker)
 * [Josh Suereth](https://github.com/jsuereth), Google
+* [Pranav Sharma](https://github.com/psx95), Google
 * [WenTao Ou](https://github.com/owent), Tencent
 
 [Emeritus

ci/install_abseil.sh

@@ -21,7 +21,9 @@ ABSEIL_CPP_BUILD_OPTIONS=(
 )
 
 if [ ! -z "${CXX_STANDARD}" ]; then
-    ABSEIL_CPP_BUILD_OPTIONS=(${ABSEIL_CPP_BUILD_OPTIONS[@]} "-DCMAKE_CXX_STANDARD=${CXX_STANDARD}")
+    ABSEIL_CPP_BUILD_OPTIONS+=("-DCMAKE_CXX_STANDARD=${CXX_STANDARD}")
+    ABSEIL_CPP_BUILD_OPTIONS+=("-DCMAKE_CXX_STANDARD_REQUIRED=ON")
+    ABSEIL_CPP_BUILD_OPTIONS+=("-DCMAKE_CXX_EXTENSIONS=OFF")
 fi
 
 #
@@ -59,6 +61,9 @@ else
   echo "Not patching abseil"
 fi
 
+echo "Building abseil ${ABSEIL_CPP_VERSION}"
+echo "CMake build options:" "${ABSEIL_CPP_BUILD_OPTIONS[@]}"
+
 mkdir build && pushd build
 cmake "${ABSEIL_CPP_BUILD_OPTIONS[@]}" ..
 make -j $(nproc)

ci/install_protobuf.sh

@@ -38,7 +38,9 @@ CPP_PROTOBUF_BUILD_OPTIONS=(
 )
 
 if [ ! -z "${CXX_STANDARD}" ]; then
-    CPP_PROTOBUF_BUILD_OPTIONS=(${CPP_PROTOBUF_BUILD_OPTIONS[@]} "-DCMAKE_CXX_STANDARD=${CXX_STANDARD}")
+    CPP_PROTOBUF_BUILD_OPTIONS+=("-DCMAKE_CXX_STANDARD=${CXX_STANDARD}")
+    CPP_PROTOBUF_BUILD_OPTIONS+=("-DCMAKE_CXX_STANDARD_REQUIRED=ON")
+    CPP_PROTOBUF_BUILD_OPTIONS+=("-DCMAKE_CXX_EXTENSIONS=OFF")
 fi
 
 # After protobuf 22/4.22, protobuf depends on absl and we can use
@@ -59,6 +61,9 @@ cd /tmp
 wget https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/${CPP_PROTOBUF_PACKAGE_NAME}.tar.gz
 tar zxf ${CPP_PROTOBUF_PACKAGE_NAME}.tar.gz --no-same-owner
 
+echo "Building protobuf ${CPP_PROTOBUF_VERSION}"
+echo "CMake build options:" "${CPP_PROTOBUF_BUILD_OPTIONS[@]}"
+
 mkdir protobuf-${CPP_PROTOBUF_VERSION}/build && pushd protobuf-${CPP_PROTOBUF_VERSION}/build
 if [ -e "../CMakeLists.txt" ]; then
   cmake .. "${CPP_PROTOBUF_BUILD_OPTIONS[@]}"

ci/setup_grpc.sh

@@ -50,6 +50,9 @@ while getopts ":v:hi:mp:r:s:TH" o; do
             elif [ "${OPTARG}" == "abseil-cpp" ]; then
                 GRPC_BUILD_OPTIONS=(${GRPC_BUILD_OPTIONS[@]} "-DgRPC_ABSL_PROVIDER=package")
                 build_internal_abseil_cpp=0
+            else
+                usage
+                exit 1;
             fi
             ;;
         r)
@@ -102,6 +105,8 @@ if [[ $build_internal_abseil_cpp -ne 0 ]]; then
     ABSEIL_CPP_BUILD_OPTIONS=(
         -DCMAKE_BUILD_TYPE=Release
         -DCMAKE_CXX_STANDARD=${std_version}
+        -DCMAKE_CXX_STANDARD_REQUIRED=ON
+        -DCMAKE_CXX_EXTENSIONS=OFF
         -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE
         -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
     )
@@ -117,12 +122,14 @@ GRPC_BUILD_OPTIONS=(
     ${GRPC_BUILD_OPTIONS[@]}
     -DgRPC_INSTALL=ON
     -DCMAKE_CXX_STANDARD=${std_version}
+    -DCMAKE_CXX_STANDARD_REQUIRED=ON
+    -DCMAKE_CXX_EXTENSIONS=OFF
     -DgRPC_BUILD_TESTS=OFF
+    -DgRPC_BUILD_GRPC_CPP_PLUGIN=ON
     -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF
     -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF
     -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF
     -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF
-    -DgRPC_BUILD_GRPC_JAVA_PLUGIN=OFF
     -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF
     -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF
     -DgRPC_BUILD_GRPCPP_OTEL_PLUGIN=OFF
@@ -133,6 +140,9 @@ if [ ! -z "$build_shared_libs" ]; then
     GRPC_BUILD_OPTIONS=(${GRPC_BUILD_OPTIONS[@]} "-DBUILD_SHARED_LIBS=$build_shared_libs")
 fi
 
+echo "Building gRPC ${install_grpc_version}"
+echo "CMake build options:" "${GRPC_BUILD_OPTIONS[@]}"
+
 cmake "${GRPC_BUILD_OPTIONS[@]}" ..
 cmake --build . -j$(nproc)
 cmake --install .