Merge branch 'main' into expo-histo-aggregation-4

Author: ThomsonTan

.devcontainer/Dockerfile.dev

@@ -8,11 +8,13 @@ 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}

.devcontainer/README.md

@@ -3,6 +3,13 @@
 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,6 +11,7 @@
 			"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}",