[pull] main from open-telemetry:main

.devcontainer/Dockerfile.dev

@@ -8,13 +8,11 @@ ARG USER_GID=1000
 ARG INSTALL_PACKAGES=
 
 ARG CXX_STANDARD=17
-ARG CMAKE_VERSION=3.31.6
 ARG ABSEIL_CPP_VERSION=20230125.3
 ARG PROTOBUF_VERSION=23.3
 ARG GRPC_VERSION=v1.55.0
 
 ENV CXX_STANDARD=${CXX_STANDARD}
-ENV CMAKE_VERSION=${CMAKE_VERSION}
 ENV ABSEIL_CPP_VERSION=${ABSEIL_CPP_VERSION}
 ENV PROTOBUF_VERSION=${PROTOBUF_VERSION}
 ENV GRPC_VERSION=${GRPC_VERSION}
@@ -27,9 +25,9 @@ RUN apt update && apt install -y wget \
     libclang-dev \
     libcurl4-openssl-dev \
     clang-tidy \
-    shellcheck
+    shellcheck \
+    cmake
 
-RUN cd /opt/ci && bash setup_cmake.sh
 RUN cd /opt/ci && bash setup_ci_environment.sh
 RUN cd /opt/ci && bash install_iwyu.sh
 RUN cd /opt && bash ci/setup_googletest.sh \

.devcontainer/README.md

@@ -3,13 +3,6 @@
 Customize your dev container using build arguments (for direct Docker builds) or
 environment variables (for evaluation in `devcontainer.json`).
 
-* **CMake version:**
-  The version of cmake to install. (Default: 3.31.6)
-  * Docker ARG:
-   `CMAKE_VERSION`
-  * Host Environment Variable:
-   `OTEL_CPP_DEVCONTAINER_CMAKE_VERSION`
-
 * **CXX standard:**
   This is the C++ standard to build from (eg: 17, 20, ...). (Default: 17)
   * Docker ARG:

.devcontainer/devcontainer.json

@@ -11,7 +11,6 @@
 			"USER_UID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_UID:1000}",
 			"USER_GID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_GID:1000}",
 			"INSTALL_PACKAGES": "${localEnv:OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES:}",
-			"CMAKE_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_CMAKE_VERSION:3.31.6}",
 			"CXX_STANDARD": "${localEnv:OTEL_CPP_DEVCONTAINER_CXX_STANDARD:17}",
 			"GRPC_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_GRPC_VERSION:v1.55.0}",
 			"PROTOBUF_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION:23.3}",

.github/workflows/ci.yml

@@ -29,7 +29,6 @@ jobs:
 #      run: |
 #        sudo -E ./ci/setup_gcc10.sh
 #        sudo -E ./ci/setup_ci_environment.sh
-#        sudo -E ./ci/setup_cmake.sh
 #        sudo -E ./ci/setup_googletest.sh
 #        sudo -E ./ci/install_abseil.sh
 #        sudo -E ./ci/install_protobuf.sh
@@ -51,7 +50,6 @@ jobs:
     - name: setup
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run cmake tests
       run: |
@@ -74,7 +72,6 @@ jobs:
     - name: setup
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: Install abseil, protobuf, and grpc with apt
       run: |
@@ -104,7 +101,6 @@ jobs:
       run: |
         sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
         sudo -E ./ci/install_protobuf.sh
     - name: setup grpc
@@ -146,7 +142,6 @@ jobs:
       run: |
         sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
         sudo -E ./ci/install_protobuf.sh
     - name: setup grpc
@@ -188,7 +183,6 @@ jobs:
       run: |
         sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
         sudo -E ./ci/install_protobuf.sh
     - name: setup grpc
@@ -230,7 +224,6 @@ jobs:
       run: |
         sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
         sudo -E ./ci/install_protobuf.sh
     - name: setup grpc
@@ -272,7 +265,6 @@ jobs:
       run: |
         sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
         sudo -E ./ci/install_protobuf.sh
     - name: setup grpc
@@ -308,7 +300,6 @@ jobs:
         submodules: 'recursive'
     - name: setup
       run: |
-        ./ci/setup_cmake.ps1
         ./ci/setup_windows_ci_environment.ps1
     - name: run tests
       run: ./ci/do_ci.ps1 cmake.maintainer.test
@@ -327,7 +318,6 @@ jobs:
         submodules: 'recursive'
     - name: setup
       run: |
-        ./ci/setup_cmake.ps1
         ./ci/setup_windows_ci_environment.ps1
     - name: run tests
       env:
@@ -348,7 +338,6 @@ jobs:
         submodules: 'recursive'
     - name: setup
       run: |
-        ./ci/setup_cmake.ps1
         ./ci/setup_windows_ci_environment.ps1
     - name: run tests
       env:
@@ -373,7 +362,6 @@ jobs:
         CXX: /usr/bin/g++-12
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run cmake tests (without otlp-exporter)
       env:
@@ -397,7 +385,6 @@ jobs:
     - name: setup
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run cmake tests (enable opentracing-shim)
       run: ./ci/do_ci.sh cmake.opentracing_shim.test
@@ -417,7 +404,6 @@ jobs:
     - name: setup
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run tests (enable stl)
       env:
@@ -439,7 +425,6 @@ jobs:
     - name: setup
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run tests (enable stl)
       env:
@@ -461,7 +446,6 @@ jobs:
     - name: setup
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run tests
       env:
@@ -491,7 +475,6 @@ jobs:
         CXXFLAGS: "-stdlib=libc++"
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run tests
       env:
@@ -523,7 +506,6 @@ jobs:
     - name: setup
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run tests
       env:
@@ -553,7 +535,6 @@ jobs:
         CXXFLAGS: "-stdlib=libc++"
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run tests
       env:
@@ -585,7 +566,6 @@ jobs:
     - name: setup
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run otlp exporter tests
       run: |
@@ -620,7 +600,6 @@ jobs:
         CXX_STANDARD: '14'
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
         sudo -E ./ci/install_abseil.sh
         sudo -E ./ci/install_protobuf.sh
@@ -646,7 +625,6 @@ jobs:
     - name: setup
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run otlp exporter tests
       run: |
@@ -668,7 +646,6 @@ jobs:
     - name: setup
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run otlp exporter tests
       run: |
@@ -693,7 +670,6 @@ jobs:
         CXX: /usr/bin/g++-12
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run tests
       env:
@@ -723,7 +699,6 @@ jobs:
     - name: setup
       run: |
         sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
         sudo ./ci/install_bazelisk.sh
     - name: run tests
       run: ./ci/do_ci.sh bazel.test
@@ -750,7 +725,6 @@ jobs:
     - name: setup
       run: |
         sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
         sudo ./ci/install_bazelisk.sh
     - name: run tests
       run: ./ci/do_ci.sh bazel.no_bzlmod.test
@@ -777,7 +751,6 @@ jobs:
     - name: setup
       run: |
         sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
         sudo ./ci/install_bazelisk.sh
     - name: run tests
       run: ./ci/do_ci.sh bazel.with_async_export.test
@@ -804,7 +777,6 @@ jobs:
     - name: setup
       run: |
         sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
         sudo ./ci/install_bazelisk.sh
     - name: run tests
       run: ./ci/do_ci.sh bazel.valgrind
@@ -831,7 +803,6 @@ jobs:
     - name: setup
       run: |
         sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
         sudo ./ci/install_bazelisk.sh
     - name: run tests
       run: ./ci/do_ci.sh bazel.noexcept
@@ -858,7 +829,6 @@ jobs:
     - name: setup
       run: |
         sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
         sudo ./ci/install_bazelisk.sh
     - name: run tests
       run: ./ci/do_ci.sh bazel.nortti
@@ -885,7 +855,6 @@ jobs:
     - name: setup
       run: |
         sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
         sudo ./ci/install_bazelisk.sh
     - name: run tests
       run: ./ci/do_ci.sh bazel.asan
@@ -912,7 +881,6 @@ jobs:
     - name: setup
       run: |
         sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
         sudo ./ci/install_bazelisk.sh
     - name: run tests
       run: ./ci/do_ci.sh bazel.tsan
@@ -1014,7 +982,6 @@ jobs:
         submodules: 'recursive'
     - name: setup
       run: |
-        ./ci/setup_cmake.ps1
         ./ci/setup_windows_ci_environment.ps1
         ./ci/install_windows_protobuf.ps1
     - name: run cmake test
@@ -1036,7 +1003,6 @@ jobs:
         submodules: 'recursive'
     - name: setup
       run: |
-        ./ci/setup_cmake.ps1
         ./ci/setup_windows_ci_environment.ps1
         ./ci/install_windows_protobuf.ps1
     - name: run cmake test (DLL build)
@@ -1060,7 +1026,6 @@ jobs:
         submodules: 'recursive'
     - name: setup
       run: |
-        ./ci/setup_cmake.ps1
         ./ci/setup_windows_ci_environment.ps1
         ./ci/install_windows_protobuf.ps1
     - name: run cmake test
@@ -1100,7 +1065,6 @@ jobs:
         submodules: 'recursive'
     - name: setup
       run: |
-        ./ci/setup_cmake.ps1
         ./ci/setup_windows_ci_environment.ps1
     - name: run tests
       run: ./ci/do_ci.ps1 cmake.test_example_plugin
@@ -1123,7 +1087,6 @@ jobs:
         CXX: /usr/bin/g++-10
       run: |
         sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
     - name: run tests and generate report
       env:
@@ -1220,7 +1183,6 @@ jobs:
           CXX: /usr/bin/g++-12
         run: |
           sudo -E ./ci/setup_ci_environment.sh
-          sudo -E ./ci/setup_cmake.sh
           sudo -E ./ci/setup_googletest.sh
       - name: run w3c trace-context test server (background)
         env: