From 6346994e96cd71a6dc25ec1515b54481c81fe215 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Sun, 21 Apr 2024 22:31:18 +0200 Subject: [PATCH 1/3] Upgrade CI to opentelemetry-cpp 1.15.0 --- .github/workflows/boost_log.yml | 2 +- .github/workflows/geneva_metrics.yml | 4 ++-- .github/workflows/glog.yml | 2 +- .github/workflows/log4cxx.yml | 2 +- .github/workflows/prometheus.yml | 4 ++-- .github/workflows/spdlog.yml | 2 +- .github/workflows/user_events.yml | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/boost_log.yml b/.github/workflows/boost_log.yml index 972ab7abe..c6abcd5a9 100644 --- a/.github/workflows/boost_log.yml +++ b/.github/workflows/boost_log.yml @@ -34,7 +34,7 @@ jobs: uses: actions/checkout@v3 with: repository: "open-telemetry/opentelemetry-cpp" - ref: "v1.14.2" + ref: "v1.15.0" path: "opentelemetry-cpp" submodules: "recursive" - name: setup dependencies diff --git a/.github/workflows/geneva_metrics.yml b/.github/workflows/geneva_metrics.yml index ab9cf693b..5b6ac03f0 100644 --- a/.github/workflows/geneva_metrics.yml +++ b/.github/workflows/geneva_metrics.yml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v3 with: repository: "open-telemetry/opentelemetry-cpp" - ref: "v1.11.0" + ref: "v1.15.0" path: "otel_cpp" submodules: "recursive" - name: setup @@ -34,7 +34,7 @@ jobs: ca-certificates wget git valgrind lcov - name: run tests run: | - sudo $GITHUB_WORKSPACE/otel_cpp/ci/setup_cmake.sh + sudo $GITHUB_WORKSPACE/otel_cpp/ci/setup_googletest.sh mkdir -p "$GITHUB_WORKSPACE/otel_cpp/build" cd "$GITHUB_WORKSPACE/otel_cpp/build" cmake .. -DOPENTELEMETRY_INSTALL=ON diff --git a/.github/workflows/glog.yml b/.github/workflows/glog.yml index c2e4e0542..750cee487 100644 --- a/.github/workflows/glog.yml +++ b/.github/workflows/glog.yml @@ -38,7 +38,7 @@ jobs: uses: actions/checkout@v3 with: repository: "open-telemetry/opentelemetry-cpp" - ref: "v1.14.2" + ref: "v1.15.0" path: "opentelemetry-cpp" submodules: "recursive" - name: setup dependencies diff --git a/.github/workflows/log4cxx.yml b/.github/workflows/log4cxx.yml index 2138e3516..67ade4519 100644 --- a/.github/workflows/log4cxx.yml +++ b/.github/workflows/log4cxx.yml @@ -38,7 +38,7 @@ jobs: uses: actions/checkout@v3 with: repository: "open-telemetry/opentelemetry-cpp" - ref: "v1.14.2" + ref: "v1.15.0" path: "opentelemetry-cpp" submodules: "recursive" - name: setup dependencies diff --git a/.github/workflows/prometheus.yml b/.github/workflows/prometheus.yml index 7aa9e8fd5..df15c8d36 100644 --- a/.github/workflows/prometheus.yml +++ b/.github/workflows/prometheus.yml @@ -65,7 +65,7 @@ jobs: uses: actions/checkout@v3 with: repository: "open-telemetry/opentelemetry-cpp" - ref: "v1.11.0" + ref: "v1.15.0" path: "otel_cpp" submodules: "recursive" - name: run tests @@ -103,7 +103,7 @@ jobs: uses: actions/checkout@v3 with: repository: "open-telemetry/opentelemetry-cpp" - ref: "v1.11.0" + ref: "v1.15.0" path: "otel_cpp" submodules: "recursive" - name: setup diff --git a/.github/workflows/spdlog.yml b/.github/workflows/spdlog.yml index a99e9ac54..8ce0f4f49 100644 --- a/.github/workflows/spdlog.yml +++ b/.github/workflows/spdlog.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v3 with: repository: "open-telemetry/opentelemetry-cpp" - ref: "v1.14.2" + ref: "v1.15.0" path: "opentelemetry-cpp" submodules: "recursive" - name: setup dependencies diff --git a/.github/workflows/user_events.yml b/.github/workflows/user_events.yml index a32008898..21182a56c 100644 --- a/.github/workflows/user_events.yml +++ b/.github/workflows/user_events.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v3 with: repository: "open-telemetry/opentelemetry-cpp" - ref: "v1.14.2" + ref: "v1.15.0" path: "opentelemetry-cpp" submodules: "recursive" - name: setup dependencies @@ -47,9 +47,9 @@ jobs: - name: run tests run: | - sudo $GITHUB_WORKSPACE/opentelemetry-cpp/ci/setup_cmake.sh + sudo $GITHUB_WORKSPACE/opentelemetry-cpp/ci/setup_googletest.sh mkdir -p "$GITHUB_WORKSPACE/opentelemetry-cpp/build" cd "$GITHUB_WORKSPACE/opentelemetry-cpp/build" cmake .. -G Ninja -D OPENTELEMETRY_EXTERNAL_COMPONENT_PATH=$GITHUB_WORKSPACE/opentelemetry-cpp-contrib/exporters/user_events -D WITH_OTLP_HTTP=ON cmake --build . -j$(nproc) - ctest -j1 --output-on-failure \ No newline at end of file + ctest -j1 --output-on-failure From b43d9e1ec44e72eb68585e6605916f91d9c008c3 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Tue, 23 Apr 2024 00:59:23 +0200 Subject: [PATCH 2/3] Debug build --- .github/workflows/prometheus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/prometheus.yml b/.github/workflows/prometheus.yml index df15c8d36..97ea44e6a 100644 --- a/.github/workflows/prometheus.yml +++ b/.github/workflows/prometheus.yml @@ -65,7 +65,8 @@ jobs: uses: actions/checkout@v3 with: repository: "open-telemetry/opentelemetry-cpp" - ref: "v1.15.0" + # Fails in unit tests: ref: "v1.15.0" + ref: "v1.12.0" path: "otel_cpp" submodules: "recursive" - name: run tests From 5f5c67f318c34270c84e94fa7b8a07bea0600a2d Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 24 Apr 2024 09:38:16 +0200 Subject: [PATCH 3/3] Revert prometheus changes --- .github/workflows/prometheus.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/prometheus.yml b/.github/workflows/prometheus.yml index 97ea44e6a..7aa9e8fd5 100644 --- a/.github/workflows/prometheus.yml +++ b/.github/workflows/prometheus.yml @@ -65,8 +65,7 @@ jobs: uses: actions/checkout@v3 with: repository: "open-telemetry/opentelemetry-cpp" - # Fails in unit tests: ref: "v1.15.0" - ref: "v1.12.0" + ref: "v1.11.0" path: "otel_cpp" submodules: "recursive" - name: run tests @@ -104,7 +103,7 @@ jobs: uses: actions/checkout@v3 with: repository: "open-telemetry/opentelemetry-cpp" - ref: "v1.15.0" + ref: "v1.11.0" path: "otel_cpp" submodules: "recursive" - name: setup