From 625fbb2f86e38bc42c9e3608dbb9ab80b1e3885f Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Thu, 28 Mar 2024 22:18:58 -0700 Subject: [PATCH 1/4] [Geneva] add CI for user_events exporter --- .github/workflows/user_events.yml | 54 +++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .github/workflows/user_events.yml diff --git a/.github/workflows/user_events.yml b/.github/workflows/user_events.yml new file mode 100644 index 000000000..a8e613c9f --- /dev/null +++ b/.github/workflows/user_events.yml @@ -0,0 +1,54 @@ +name: user_events + +on: + push: + branches: + - '*' + path: + - 'exporters/user_events/**' + - '.github/workflows/user_events.yml' + pull_request: + branches: [main] + paths: + - 'exporters/user_events/**' + - '.github/workflows/user_events.yml' + +jobs: + cmake_linux: + name: CMake Linux + runs-on: ubuntu-latest + steps: + - name: checkout opentelemetry-cpp-contrib + uses: actions/checkout@v3 + with: + path: opentelemetry-cpp-contrib + - name: checkout opentelemetry-cpp + uses: actions/checkout@v3 + with: + repository: "open-telemetry/opentelemetry-cpp" + ref: "v1.14.2" + path: "opentelemetry-cpp" + submodules: "recursive" + - name: setup dependencies + run: | + sudo apt update -y + sudo apt install -y --no-install-recommends --no-install-suggests \ + build-essential \ + cmake \ + ninja-build \ + libssl-dev \ + libcurl4-openssl-dev \ + libprotobuf-dev \ + protobuf-compiler \ + libgmock-dev \ + libgtest-dev \ + libbenchmark-dev + + - name: run tests + run: | + sudo $GITHUB_WORKSPACE/opentelemetry-cpp/ci/setup_cmake.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 -j$(nproc) --output-on-failure \ No newline at end of file From 929d1bb7b0a7a8bcdce67f6c78bb705778db9622 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Thu, 28 Mar 2024 22:22:11 -0700 Subject: [PATCH 2/4] Clone contrib repo recursively --- .github/workflows/user_events.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/user_events.yml b/.github/workflows/user_events.yml index a8e613c9f..81a713ff3 100644 --- a/.github/workflows/user_events.yml +++ b/.github/workflows/user_events.yml @@ -22,6 +22,7 @@ jobs: uses: actions/checkout@v3 with: path: opentelemetry-cpp-contrib + submodules: "recursive" - name: checkout opentelemetry-cpp uses: actions/checkout@v3 with: From 3f8d6d58ac21c9f61f8add91449180aaf3ceedd7 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Thu, 28 Mar 2024 22:49:26 -0700 Subject: [PATCH 3/4] fix test --- exporters/user_events/test/logs_exporter_test.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/exporters/user_events/test/logs_exporter_test.cc b/exporters/user_events/test/logs_exporter_test.cc index b706141fc..99ba6a838 100644 --- a/exporters/user_events/test/logs_exporter_test.cc +++ b/exporters/user_events/test/logs_exporter_test.cc @@ -28,4 +28,6 @@ TEST(UserEventsLogRecordExporter, Shutdown) std::cout.rdbuf(output.rdbuf()); EXPECT_TRUE(exporter->Shutdown()); + + std::cout.rdbuf(original); } From 5c2eca43eaf72909b0c8e351dbea5fc177679c77 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Thu, 28 Mar 2024 23:09:55 -0700 Subject: [PATCH 4/4] Run tests in sequential --- .github/workflows/user_events.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/user_events.yml b/.github/workflows/user_events.yml index 81a713ff3..a32008898 100644 --- a/.github/workflows/user_events.yml +++ b/.github/workflows/user_events.yml @@ -52,4 +52,4 @@ jobs: 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 -j$(nproc) --output-on-failure \ No newline at end of file + ctest -j1 --output-on-failure \ No newline at end of file