Merge branch 'main' into fuzztest

open-telemetry · Nov 19, 2023 · f770769 · f770769
2 parents c6d0920 + cb603ad
commit f770769
Show file tree

Hide file tree

Showing 157 changed files with 6,072 additions and 2,072 deletions.
diff --git a/.github/repository-settings.md b/.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.
+
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,12 +28,8 @@ jobs:
       run: |
         ./ci/do_ci.sh cmake.test
 
-  #
-  # This build uses the latest libraries compatible
-  # with C++11
-  #
-  cmake_gcc_maintainer_cpp11_async_test:
-    name: CMake gcc 12 (maintainer mode, C++11, async)
+  cmake_gcc_maintainer_sync_test:
+    name: CMake gcc 12 (maintainer mode, sync)
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -43,18 +39,17 @@ jobs:
       env:
         CC: /usr/bin/gcc-12
         CXX: /usr/bin/g++-12
-        GOOGLETEST_VERSION: 1.12.1
         PROTOBUF_VERSION: 21.12
       run: |
         sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_ci_environment.sh
         sudo -E ./ci/install_protobuf.sh
-    - name: run cmake gcc (maintainer mode, C++11, async)
+    - name: run cmake gcc (maintainer mode, sync)
       env:
         CC: /usr/bin/gcc-12
         CXX: /usr/bin/g++-12
       run: |
-        ./ci/do_ci.sh cmake.maintainer.cpp11.async.test
+        ./ci/do_ci.sh cmake.maintainer.sync.test
     - name: generate test cert
       env:
         CFSSL_VERSION: 1.6.3
@@ -65,8 +60,8 @@ jobs:
       run: |
         (cd ./functional/otlp; ./run_test.sh)
 
-  cmake_gcc_maintainer_sync_test:
-    name: CMake gcc 12 (maintainer mode, sync)
+  cmake_gcc_maintainer_async_test:
+    name: CMake gcc 12 (maintainer mode, async)
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -81,12 +76,12 @@ jobs:
         sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_ci_environment.sh
         sudo -E ./ci/install_protobuf.sh
-    - name: run cmake gcc (maintainer mode, sync)
+    - name: run cmake gcc (maintainer mode, async)
       env:
         CC: /usr/bin/gcc-12
         CXX: /usr/bin/g++-12
       run: |
-        ./ci/do_ci.sh cmake.maintainer.sync.test
+        ./ci/do_ci.sh cmake.maintainer.async.test
     - name: generate test cert
       env:
         CFSSL_VERSION: 1.6.3
@@ -97,28 +92,28 @@ jobs:
       run: |
         (cd ./functional/otlp; ./run_test.sh)
 
-  cmake_gcc_maintainer_async_test:
-    name: CMake gcc 12 (maintainer mode, async)
+  cmake_clang_maintainer_sync_test:
+    name: CMake clang 14 (maintainer mode, sync)
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: setup
       env:
-        CC: /usr/bin/gcc-12
-        CXX: /usr/bin/g++-12
+        CC: /usr/bin/clang-14
+        CXX: /usr/bin/clang++-14
         PROTOBUF_VERSION: 21.12
       run: |
         sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_ci_environment.sh
         sudo -E ./ci/install_protobuf.sh
-    - name: run cmake gcc (maintainer mode, async)
+    - name: run cmake clang (maintainer mode, sync)
       env:
-        CC: /usr/bin/gcc-12
-        CXX: /usr/bin/g++-12
+        CC: /usr/bin/clang-14
+        CXX: /usr/bin/clang++-14
       run: |
-        ./ci/do_ci.sh cmake.maintainer.async.test
+        ./ci/do_ci.sh cmake.maintainer.sync.test
     - name: generate test cert
       env:
         CFSSL_VERSION: 1.6.3
@@ -129,8 +124,8 @@ jobs:
       run: |
         (cd ./functional/otlp; ./run_test.sh)
 
-  cmake_clang_maintainer_sync_test:
-    name: CMake clang 14 (maintainer mode, sync)
+  cmake_clang_maintainer_async_test:
+    name: CMake clang 14 (maintainer mode, async)
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -145,12 +140,12 @@ jobs:
         sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_ci_environment.sh
         sudo -E ./ci/install_protobuf.sh
-    - name: run cmake clang (maintainer mode, sync)
+    - name: run cmake clang (maintainer mode, async)
       env:
         CC: /usr/bin/clang-14
         CXX: /usr/bin/clang++-14
       run: |
-        ./ci/do_ci.sh cmake.maintainer.sync.test
+        ./ci/do_ci.sh cmake.maintainer.async.test
     - name: generate test cert
       env:
         CFSSL_VERSION: 1.6.3
@@ -161,8 +156,8 @@ jobs:
       run: |
         (cd ./functional/otlp; ./run_test.sh)
 
-  cmake_clang_maintainer_async_test:
-    name: CMake clang 14 (maintainer mode, async)
+  cmake_clang_maintainer_abiv2_test:
+    name: CMake clang 14 (maintainer mode, abiv2)
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -177,12 +172,12 @@ jobs:
         sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_ci_environment.sh
         sudo -E ./ci/install_protobuf.sh
-    - name: run cmake clang (maintainer mode, async)
+    - name: run cmake clang (maintainer mode, abiv2)
       env:
         CC: /usr/bin/clang-14
         CXX: /usr/bin/clang++-14
       run: |
-        ./ci/do_ci.sh cmake.maintainer.async.test
+        ./ci/do_ci.sh cmake.maintainer.abiv2.test
     - name: generate test cert
       env:
         CFSSL_VERSION: 1.6.3
@@ -258,63 +253,41 @@ jobs:
     - name: run cmake tests (enable opentracing-shim)
       run: ./ci/do_ci.sh cmake.opentracing_shim.test
 
-  cmake_gcc_48_test:
-    name: CMake gcc 4.8 (without otlp exporter)
+  cmake_test_cxx14_gcc:
+    name: CMake C++14 test(GCC)
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - name: Add Ubuntu Xenial package sources
-      run: |
-          sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial main'
-          sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial universe'
     - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/install_gcc48.sh
-    - name: setup cmake
       env:
-        CC: /usr/bin/gcc-4.8
-        CXX: /usr/bin/g++-4.8
-        GOOGLETEST_VERSION: 1.10.0
+        CMAKE_VERSION: 3.20.6
       run: |
+        sudo -E ./ci/setup_ci_environment.sh
         sudo -E ./ci/setup_cmake.sh
-    - name: run tests
+    - name: run tests (enable stl)
       env:
-        CC: /usr/bin/gcc-4.8
-        CXX: /usr/bin/g++-4.8
-        CXX_STANDARD: '11'
-      run: ./ci/do_ci.sh cmake.legacy.test
+        CXX_STANDARD: '14'
+      run: ./ci/do_ci.sh cmake.c++14.stl.test
 
-  cmake_gcc_48_otlp_exporter_test:
-    name: CMake gcc 4.8 (with otlp exporter)
+  cmake_test_cxx17_gcc:
+    name: CMake C++17 test(GCC)
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - name: Add Ubuntu Xenial package sources
-      run: |
-          sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial main'
-          sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial universe'
     - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/install_gcc48.sh
-    - name: setup cmake and grpc
       env:
-        CC: /usr/bin/gcc-4.8
-        CXX: /usr/bin/g++-4.8
-        GOOGLETEST_VERSION: 1.10.0
+        CMAKE_VERSION: 3.20.6
       run: |
+        sudo -E ./ci/setup_ci_environment.sh
         sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_grpc.sh -v 4.8
-    - name: run tests
+    - name: run tests (enable stl)
       env:
-        CC: /usr/bin/gcc-4.8
-        CXX: /usr/bin/g++-4.8
-      run: ./ci/do_ci.sh cmake.legacy.exporter.otprotocol.test
+        CXX_STANDARD: '17'
+      run: ./ci/do_ci.sh cmake.c++17.stl.test
 
   cmake_test_cxx20_gcc:
     name: CMake C++20 test(GCC)

diff --git a/.github/workflows/dependencies_image.yml b/.github/workflows/dependencies_image.yml
@@ -14,14 +14,14 @@ jobs:
       uses: actions/checkout@v4
     -
       name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
     -
       name: Set up Docker Buildx
       id: buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
     -
       name: Build Image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         builder: ${{ steps.buildx.outputs.name }}
         context: ci/

diff --git a/.github/workflows/project_management_comment.yml b/.github/workflows/project_management_comment.yml
@@ -12,7 +12,7 @@ jobs:
       issues: write
     steps:
       - name: Add comment
-        uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa
+        uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |

diff --git a/.github/workflows/project_management_issue_open.yml b/.github/workflows/project_management_issue_open.yml
@@ -10,7 +10,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             github.rest.issues.addLabels({