Merge branch 'main' into merge_config_sampler_model

Author: marcalff

.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/benchmark.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit