Merge branch 'main' into randomfork

.github/repository-settings.md

@@ -0,0 +1,38 @@
+# Process
+
+This file documents local admin changes for opentelemetry-cpp,
+per the community process: https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md
+
+Please note that the EasyCLA check **MUST** stay **REQUIRED**,
+it should never be disabled or bypassed, at the risk of tainting the repository.
+
+# Guidelines
+
+The best is to open a PR first that describes the change,
+so it can be discussed during review (maybe it is not needed,
+maybe there is an alternate solution, ...).
+
+The PR must add a log entry in this file, detailing:
+
+* the date the change is implemented
+* what is changed exactly (which setting)
+* a short rationale
+
+Admin changes are then applied only when the PR is merged.
+
+If for some reason a change is implemented in emergency,
+before a PR can be discussed and merged,
+a PR should still be prepared and pushed after the fact to
+describe the settings changed.
+
+# Log of local changes
+
+## 2023-11-03
+
+Created log file `.github/repository-settings.md`, since admin permissions are now granted to maintainers.
+
+See https://github.com/open-telemetry/community/issues/1727
+
+No setting changed.
+
+

.github/workflows/benchmark.yml

@@ -13,7 +13,7 @@ jobs:
     name: Run OpenTelemetry-cpp benchmarks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Mount Bazel Cache
@@ -25,12 +25,12 @@ jobs:
           key: bazel_benchmark
       - name: setup
         run: |
-          sudo ./ci/setup_cmake.sh
           sudo ./ci/setup_ci_environment.sh
+          sudo ./ci/install_bazelisk.sh
       - name: Run benchmark
         id: run_benchmarks
         run: |
-          CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ci/do_ci.sh bazel.benchmark
+          ./ci/do_ci.sh bazel.benchmark
           mkdir -p benchmarks
           mv api-benchmark_result.json benchmarks
           mv sdk-benchmark_result.json benchmarks
@@ -47,7 +47,7 @@ jobs:
     name: Store benchmark result
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/download-artifact@master
         with:
           name: benchmark_results