Merge branch 'main' of https://github.com/malkia/opentelemetry-cpp

Please enter a commit message to explain why this merge is necessary,

Author: malkia

.bazelrc

@@ -4,7 +4,7 @@
 # Track changes in folders referenced by copy_directory
 startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
 
-build --features=parse_headers
+#build --features=parse_headers
 #build --features=layering_check
 
 # Don't try to build .so and .dylib shared libs (instead of static) libs on Linux/OSX
@@ -26,8 +26,9 @@ test --test_tag_filters=-jaeger,-opentracing,-opentracing_shim
 build --experimental_convenience_symlinks=clean
 
 build:windows      --copt="/Brepro"      --copt="/guard:cf"      --copt="/guard:ehcont"      --copt="/Z7"      --copt="/JMC-"      --copt="/sdl" 
-build:windows      --linkopt="/Brepro"      --linkopt="/guard:cf"      --linkopt="/guard:ehcont" --linkopt="/DEBUG:FULL" --linkopt="/CETCOMPAT" --linkopt="/SWAPRUN:NET,CD" --linkopt="/OPT:REF,ICF" --linkopt="/RELEASE" --linkopt="/DEBUGTYPE:CV,PDATA,FIXUP" 
+build:windows      --linkopt="/Brepro"      --linkopt="/guard:cf"      --linkopt="/guard:ehcont" --linkopt="/DEBUG:FULL" --linkopt="/CETCOMPAT" --linkopt="/SWAPRUN:NET,CD" --linkopt="/OPT:REF,NOICF" --linkopt="/RELEASE" --linkopt="/DEBUGTYPE:CV,PDATA,FIXUP" 
 build:windows --copt="/Zc:strictStrings"
+build:windows --copt="/Gy"
 build:windows --host_linkopt="shell32.lib" 
 # Requires Visual Studio 2019 Build Tools installed in default location with the latest compiler (14.29.30133) for x64
 build:windows      --action_env=BAZEL_VC_FULL_VERSION=14.29.30133      --action_env=BAZEL_WINSDK_FULL_VERSION=10.0.22621.0
@@ -51,9 +52,9 @@ build:macos --strip=never --copt=-g --cxxopt=-g
 # Does not yet compoile with the Developer command-line tools, needs clang from homebrew
 #build:macos --action_env=/Library/Developer/CommandLineTools/usr/bin/clang
 #build:macos --host_action_env=/Library/Developer/CommandLineTools/usr/bin/clang
-build:macos --action_env=CC=/opt/homebrew/bin/clang
-build:macos --host_action_env=CC=/opt/homebrew/bin/clang
-build:macos --apple_generate_dsym --output_groups=+dsyms
+build:macos --action_env=CC=/opt/homebrew/opt/llvm/bin/clang
+build:macos --host_action_env=CC=/opt/homebrew/opt/llvm/bin/clang
+#build:macos --apple_generate_dsym --output_groups=+dsyms
 
 # --config=asan : Address Sanitizer.
 common:asan --copt -DADDRESS_SANITIZER
@@ -115,10 +116,6 @@ common --incompatible_modify_execution_info_additive
 common --modify_execution_info=CppCompile=+supports-path-mapping
 common --skip_incompatible_explicit_targets
 
-build --@curl//:use_mbedtls=true 
-# build --@curl//:http_only=true
-
-
 # build --experimental_save_feature_state
 # saves .s and .ii files but tends to be super slow
 # build --save_temps
@@ -129,12 +126,12 @@ mod --lockfile_mode=refresh
 build:windows --config=clang-cl
 
 # See MODULE.bazel where we've disabled the platform/toolchain setup, but made it back here
+build:clang-cl --host_copt=-Wno-dynamic-class-memaccess --copt=-Wno-dynamic-class-memaccess
+build:clang-cl --host_copt=-Wno-microsoft-cast --copt=-Wno-microsoft-cast
+build:clang-cl --host_copt=-Wno-invalid-offsetof --copt=-Wno-invalid-offsetof
+
 build:clang-cl --host_platform=@otel_sdk//:x64_windows-clang-cl
 build:clang-cl --extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl
-build:clang-cl --per_file_copt="protobuf\\+/.*@-Wno-invalid-offsetof"
-build:clang-cl --host_per_file_copt="protobuf\\+/.*@-Wno-invalid-offsetof"
-build:clang-cl --per_file_copt="c-ares\\+/.*@-Wno-macro-redefined"
-build:clang-cl --host_per_file_copt="c-ares\\+/.*@-Wno-macro-redefined"
 
 common --experimental_enable_android_migration_apis
 
@@ -145,6 +142,9 @@ startup --client_debug
 
 common --flag_alias=dll=@otel_sdk//:with_dll
 
+# disable GRPC experiments
+build --define=grpc_experiments_are_final=true
+
 ## This is what my ../top.bazelrc contains (not in the repo as local to my machine)
 # build --disk_cache=f:/b/d
 # common --repository_cache=f:/b/r

.bazelversion

@@ -1 +1 @@
-8.1.0rc4
+8.2.0rc3

.clang-format

@@ -59,3 +59,15 @@ IndentPPDirectives: AfterHash
 
 # Include blocks style
 IncludeBlocks: Preserve
+
+AttributeMacros:
+  - OPENTELEMETRY_UNLIKELY
+  - OPENTELEMETRY_LIKELY
+  - OPENTELEMETRY_MAYBE_UNUSED
+  - OPENTELEMETRY_DEPRECATED
+  - OPENTELEMETRY_API_SINGLETON
+  - OPENTELEMETRY_LOCAL_SYMBOL
+  - OPENTELEMETRY_EXPORT
+  - OPENTELEMETRY_SANITIZER_NO_MEMORY
+  - OPENTELEMETRY_SANITIZER_NO_THREAD
+  - OPENTELEMETRY_SANITIZER_NO_ADDRESS

.devcontainer/Dockerfile.conan

@@ -0,0 +1,55 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+FROM ubuntu:24.04
+
+RUN apt update && apt install -y \
+	build-essential \
+	ca-certificates \
+	wget \
+	cmake \
+	git \
+	sudo \
+	nano \
+	pkg-config \
+	ninja-build \
+	clang-format \
+	clang-tidy \
+	autoconf \
+	automake \
+	libtool \
+	python3-pip
+
+RUN pip install conan --break-system-packages
+
+ARG USER_UID=1000
+ARG USER_GID=1000
+ARG USER_NAME=devuser
+ENV USER_NAME=devuser
+ENV USER_UID=${USER_UID}
+ENV USER_GID=${USER_GID}
+ENV INSTALL_PACKAGES=
+ENV IS_CONTAINER_BUILD=true
+
+COPY ./.devcontainer/customize_container.sh /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
+RUN /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
+USER devuser
+
+RUN conan profile detect --force	
+
+ARG CONAN_FILE=conanfile_stable.txt
+ARG CONAN_BUILD_TYPE=Debug
+ARG CXX_STANDARD=17
+WORKDIR /home/devuser/conan
+COPY ./install/conan/ .
+
+RUN conan install ./${CONAN_FILE} --build=missing -s build_type=${CONAN_BUILD_TYPE}
+ENV CMAKE_TOOLCHAIN_FILE=/home/devuser/conan/build/${CONAN_BUILD_TYPE}/generators/conan_toolchain.cmake
+ENV CXX_STANDARD=${CXX_STANDARD}
+ENV BUILD_TYPE=${CONAN_BUILD_TYPE}
+ENV CONAN_FILE=${CONAN_FILE}
+
+WORKDIR  /workspaces/opentelemetry-cpp
+
+ENTRYPOINT []
+
+CMD ["/bin/bash"]

.devcontainer/Dockerfile.dev

@@ -3,26 +3,56 @@
 
 FROM otel/cpp_format_tools
 
+ARG USER_UID=1000
+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
-ARG PROTOBUF_VERSION=23.4
-ARG ABSEIL_CPP_VERSION=20240116.1
 
-ENV PROTOBUF_VERSION=${PROTOBUF_VERSION}
+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}
 
 COPY ci /opt/ci
 
 RUN apt update && apt install -y wget \
 	ninja-build \
 	libcurl4-openssl-dev \
-	markdownlint
+	clang-tidy \
+	shellcheck
 
 RUN cd /opt/ci && bash setup_cmake.sh
 RUN cd /opt/ci && bash setup_ci_environment.sh
 RUN cd /opt && bash ci/setup_googletest.sh \
-	&& bash ci/setup_grpc.sh -r ${GRPC_VERSION}
+    && bash ci/install_abseil.sh \
+    && bash ci/install_protobuf.sh \
+    && bash ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
 
 ADD https://github.com/bazelbuild/bazelisk/releases/download/v1.22.1/bazelisk-linux-amd64 /usr/local/bin
 
 RUN git config --global core.autocrlf input \
 	&& chmod +x /usr/local/bin/bazelisk-linux-amd64
+
+ENV INSTALL_PACKAGES=${INSTALL_PACKAGES}
+ENV USER_NAME=devuser
+ENV USER_UID=${USER_UID}
+ENV USER_GID=${USER_GID}
+ENV IS_CONTAINER_BUILD=true
+
+COPY ./.devcontainer/customize_container.sh /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
+RUN /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
+RUN apt install -y npm && npm install -g markdownlint-cli
+
+USER devuser
+
+WORKDIR  /workspaces/opentelemetry-cpp
+
+ENTRYPOINT []
+
+CMD ["/bin/bash"]

.devcontainer/README.md

@@ -0,0 +1,65 @@
+# Customizing Your Dev Container
+
+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:
+   `CXX_STANDARD`
+  * Host Environment Variable:
+   `OTEL_CPP_DEVCONTAINER_CXX_STANDARD`
+
+* **abseil-cpp version:**
+  This is the version of abseil-cpp that will be used to build protobuf, gRPC,
+  and opentelemetry-cpp.
+  * Docker ARG:
+   `ABSEIL_CPP_VERSION`
+  * Host Environment Variable:
+   `OTEL_CPP_DEVCONTAINER_ABSEIL_CPP_VERSION`
+
+* **Protobuf version:**
+  * Docker ARG:
+   `PROTOBUF_VERSION`
+  * Host Environment Variable:
+   `OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION`
+
+* **gRPC version:**
+  * Docker ARG:
+   `GRPC_VERSION`
+  * Host Environment Variable:
+   `OTEL_CPP_DEVCONTAINER_GRPC_VERSION`
+
+* **User ID (UID):**
+  User ID (Default: `1000`)
+  * Docker ARG:
+   `USER_UID`
+  * Host Environment Variable:
+   `OTEL_CPP_DEVCONTAINER_USER_UID`
+
+* **Group ID (GID):**
+  User group ID (Default: `1000`)
+  * Docker ARG:
+   `USER_GID`
+  * Host Environment Variable:
+   `OTEL_CPP_DEVCONTAINER_USER_GID`
+
+* **Install Packages:**
+  These are the additional packages that will be installed via `apt install` in the devcontainer. This is a space separated list.
+  * Docker ARG:
+   `INSTALL_PACKAGES`  (Default: ``)
+  * Host Environment Variable:
+   `OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES` (Default: ``)
+
+## Examples
+
+* `docker build --build-arg CXX_STANDARD="20" --build-arg INSTALL_PACKAGES="nano gitk"...`
+* `export OTEL_CPP_DEVCONTAINER_CXX_STANDARD=20`
+* `export OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES="nano gitk"`

.devcontainer/customize_container.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+set -eu
+
+if [[ $IS_CONTAINER_BUILD != "true" ]]; then
+     echo "This script should only run inside a Docker container."
+     exit 1
+fi
+
+if [[ -n "$INSTALL_PACKAGES" ]]; then
+    packages=($INSTALL_PACKAGES)
+    for package in "${packages[@]}"; do
+        apt install -y "$package"
+    done
+fi
+
+if [[ $(id "$USER_NAME" 2>/dev/null) ]]; then
+    echo "User '$USER_NAME' already exists. Removing it."
+    userdel -rf "$USER_NAME"
+elif [[ $(id -u "$USER_UID" 2>/dev/null) ]]; then
+    OTHER_USER=$(getent passwd "$USER_UID" | cut -d: -f1)
+    echo "User '$OTHER_USER' exists with UID $USER_UID. Removing it."
+    userdel -rf "$OTHER_USER"
+fi
+
+if [[ ! $(getent group "$USER_GID" 2>/dev/null) ]]; then
+    echo "Group '$USER_GID' does not exist. Adding it."
+    groupadd -g "$USER_GID" "$USER_NAME"
+fi
+
+useradd -m -u "$USER_UID" -g "$USER_GID" -s /bin/bash "$USER_NAME"
+echo "Created user '$USER_NAME' (UID: $USER_UID, GID: $USER_GID)."
+
+echo "$USER_NAME ALL=(ALL) NOPASSWD:ALL" | tee /etc/sudoers.d/"$USER_NAME"
+
+echo "User and group setup complete."

.devcontainer/devcontainer.json

@@ -8,19 +8,28 @@
 		"context": "..",
 		"dockerfile": "Dockerfile.dev",
 		"args": {
-			"GRPC_VERSION": "v1.55.0",
-			"PROTOBUF_VERSION": "23.4",
-			"ABSEIL_CPP_VERSION":"20240116.1"
+			"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}",
+			"ABSEIL_CPP_VERSION":"${localEnv:OTEL_CPP_DEVCONTAINER_ABSEIL_CPP_VERSION:20230125.3}"
 		}
 	},
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/sh"
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-vscode.cpptools",
+				"ms-azuretools.vscode-docker",
+				"ms-vscode.cpptools-extension-pack"
+			],
+			"settings": {
+				"terminal.integrated.shell.linux": "/bin/bash",
+			}
+		}
 	},
-	"extensions": [
-		"ms-vscode.cpptools",
-		"ms-azuretools.vscode-docker",
-		"ms-vscode.cpptools-extension-pack"
-	],
 
-	"remoteUser": "root"
+	"remoteUser": "devuser"
 }

.github/workflows/benchmark.yml

@@ -13,11 +13,11 @@ jobs:
     name: Run OpenTelemetry-cpp benchmarks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: 'recursive'
       - name: Mount Bazel Cache
-        uses: actions/cache@v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         env:
           cache-name: bazel_cache
         with:
@@ -35,7 +35,7 @@ jobs:
           mv api-benchmark_result.json benchmarks
           mv sdk-benchmark_result.json benchmarks
           mv exporters-benchmark_result.json benchmarks
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: benchmark_results
           path: benchmarks
@@ -47,8 +47,8 @@ jobs:
     name: Store benchmark result
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@master
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           name: benchmark_results
           path: benchmarks
@@ -57,7 +57,7 @@ jobs:
         run: |
           cat benchmarks/*
       - name: Push benchmark result
-        uses: benchmark-action/github-action-benchmark@v1
+        uses: benchmark-action/github-action-benchmark@d48d326b4ca9ba73ca0cd0d59f108f9e02a381c7 # v1.20.4
         with:
           name: OpenTelemetry-cpp ${{ matrix.components }} Benchmark
           tool: 'googlecpp'