From a03dc6dad3606f77896fb1fe91a5e28f3582b1ca Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Fri, 21 May 2021 17:57:33 -0700 Subject: [PATCH 1/4] Add Jaeger exporter to CMake CI build --- .github/workflows/ci.yml | 4 ++- ci/do_ci.sh | 1 + ci/setup_thrift.sh | 42 ++++++++++++++++++++++++++++ exporters/jaeger/src/thrift_sender.h | 2 +- exporters/jaeger/src/udp_transport.h | 2 +- 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 ci/setup_thrift.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b234c75081..29c27dde14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,9 @@ jobs: sudo ./ci/setup_cmake.sh sudo ./ci/setup_ci_environment.sh - name: run cmake tests (without otlp-exporter) - run: ./ci/do_ci.sh cmake.test + run: | + sudo ./ci/setup_thrift.sh + ./ci/do_ci.sh cmake.test cmake_gcc_48_test: name: CMake gcc 4.8 diff --git a/ci/do_ci.sh b/ci/do_ci.sh index ba19f94269..318916a82d 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -31,6 +31,7 @@ if [[ "$1" == "cmake.test" ]]; then cmake -DCMAKE_BUILD_TYPE=Debug \ -DWITH_PROMETHEUS=ON \ -DWITH_ZIPKIN=ON \ + -DWITH_JAEGER=ON \ -DWITH_ELASTICSEARCH=ON \ -DWITH_METRICS_PREVIEW=ON \ -DCMAKE_CXX_FLAGS="-Werror" \ diff --git a/ci/setup_thrift.sh b/ci/setup_thrift.sh new file mode 100644 index 0000000000..03d1a7851d --- /dev/null +++ b/ci/setup_thrift.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +set -e +export DEBIAN_FRONTEND=noninteractive +export THRIFT_VERSION=0.14.1 + +if ! type cmake > /dev/null; then + #cmake not installed, exiting + exit 1 +fi +export BUILD_DIR=/tmp/ +export INSTALL_DIR=/usr/local/ + +apt install -y --no-install-recommends \ + libboost-all-dev \ + libevent-dev \ + libssl-dev \ + ninja-build + +pushd $BUILD_DIR +wget https://github.com/apache/thrift/archive/refs/tags/v${THRIFT_VERSION}.tar.gz +tar -zxvf v${THRIFT_VERSION}.tar.gz +cd thrift-${THRIFT_VERSION} +mkdir -p out +pushd out +cmake -G Ninja .. \ + -DBUILD_COMPILER=OFF \ + -DBUILD_CPP=ON \ + -DBUILD_LIBRARIES=ON \ + -DBUILD_NODEJS=OFF \ + -DBUILD_PYTHON=OFF \ + -DBUILD_JAVASCRIPT=OFF \ + -DBUILD_C_GLIB=OFF \ + -DBUILD_JAVA=OFF \ + -DBUILD_TESTING=OFF \ + -DBUILD_TUTORIALS=OFF \ + .. + +ninja -j $(nproc) +ninja install +popd +popd diff --git a/exporters/jaeger/src/thrift_sender.h b/exporters/jaeger/src/thrift_sender.h index 4d503d66db..7957ec68ed 100644 --- a/exporters/jaeger/src/thrift_sender.h +++ b/exporters/jaeger/src/thrift_sender.h @@ -14,7 +14,7 @@ #pragma once -#include +#include #include #include #include diff --git a/exporters/jaeger/src/udp_transport.h b/exporters/jaeger/src/udp_transport.h index 3b40f182e8..cda82810fd 100644 --- a/exporters/jaeger/src/udp_transport.h +++ b/exporters/jaeger/src/udp_transport.h @@ -17,7 +17,7 @@ #include "TUDPTransport.h" #include "transport.h" -#include +#include #include #include #include From 1e2f9f75a1c58ace8096048972b9245472973e3d Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Fri, 21 May 2021 18:14:03 -0700 Subject: [PATCH 2/4] Add -x to setup_thrift.sh --- ci/setup_thrift.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 ci/setup_thrift.sh diff --git a/ci/setup_thrift.sh b/ci/setup_thrift.sh old mode 100644 new mode 100755 From 94411f2de73b94b58a2e1f41fa24135bc00af96a Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Sun, 23 May 2021 11:30:55 -0700 Subject: [PATCH 3/4] Remove sudo in ci.yml --- .github/workflows/ci.yml | 64 ++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29c27dde14..2ce3f8fec1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,11 +16,11 @@ jobs: submodules: 'recursive' - name: setup run: | - sudo ./ci/setup_cmake.sh - sudo ./ci/setup_ci_environment.sh + ./ci/setup_cmake.sh + ./ci/setup_ci_environment.sh - name: run cmake tests (without otlp-exporter) run: | - sudo ./ci/setup_thrift.sh + ./ci/setup_thrift.sh ./ci/do_ci.sh cmake.test cmake_gcc_48_test: @@ -32,11 +32,11 @@ jobs: submodules: 'recursive' - name: setup run: | - sudo ./ci/setup_ci_environment.sh - sudo ./ci/install_gcc48.sh + ./ci/setup_ci_environment.sh + ./ci/install_gcc48.sh - name: setup cmake run: | - sudo CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/setup_cmake.sh + CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/setup_cmake.sh - name: run tests run: ./ci/do_ci.sh cmake.legacy.test env: @@ -52,8 +52,8 @@ jobs: submodules: 'recursive' - name: setup run: | - sudo ./ci/setup_ci_environment.sh - sudo ./ci/setup_cmake.sh + ./ci/setup_ci_environment.sh + ./ci/setup_cmake.sh - name: run tests run: ./ci/do_ci.sh cmake.c++20.test @@ -66,11 +66,11 @@ jobs: submodules: 'recursive' - name: setup run: | - sudo ./ci/setup_cmake.sh - sudo ./ci/setup_ci_environment.sh + ./ci/setup_cmake.sh + ./ci/setup_ci_environment.sh - name: run otlp exporter tests run: | - sudo ./ci/setup_grpc.sh + ./ci/setup_grpc.sh ./ci/do_ci.sh cmake.exporter.otprotocol.test plugin_test: @@ -82,8 +82,8 @@ jobs: submodules: 'recursive' - name: setup run: | - sudo ./ci/setup_cmake.sh - sudo ./ci/setup_ci_environment.sh + ./ci/setup_cmake.sh + ./ci/setup_ci_environment.sh - name: run tests run: ./ci/do_ci.sh cmake.test_example_plugin @@ -103,9 +103,9 @@ jobs: key: bazel_gcc_48_test - name: setup run: | - sudo ./ci/setup_ci_environment.sh - sudo ./ci/install_bazelisk.sh - sudo ./ci/install_gcc48.sh + ./ci/setup_ci_environment.sh + ./ci/install_bazelisk.sh + ./ci/install_gcc48.sh - name: run tests run: ./ci/do_ci.sh bazel.legacy.test env: @@ -127,8 +127,8 @@ jobs: key: bazel_test - name: setup run: | - sudo ./ci/setup_ci_environment.sh - sudo ./ci/install_bazelisk.sh + ./ci/setup_ci_environment.sh + ./ci/install_bazelisk.sh - name: run tests run: ./ci/do_ci.sh bazel.test @@ -148,8 +148,8 @@ jobs: key: bazel_valgrind - name: setup run: | - sudo ./ci/setup_ci_environment.sh - sudo ./ci/install_bazelisk.sh + ./ci/setup_ci_environment.sh + ./ci/install_bazelisk.sh - name: run tests run: ./ci/do_ci.sh bazel.valgrind @@ -169,8 +169,8 @@ jobs: key: bazel_noexcept - name: setup run: | - sudo ./ci/setup_ci_environment.sh - sudo ./ci/install_bazelisk.sh + ./ci/setup_ci_environment.sh + ./ci/install_bazelisk.sh - name: run tests run: ./ci/do_ci.sh bazel.noexcept @@ -190,8 +190,8 @@ jobs: key: bazel_asan - name: setup run: | - sudo ./ci/setup_ci_environment.sh - sudo ./ci/install_bazelisk.sh + ./ci/setup_ci_environment.sh + ./ci/install_bazelisk.sh - name: run tests run: ./ci/do_ci.sh bazel.asan @@ -211,8 +211,8 @@ jobs: key: bazel_tsan - name: setup run: | - sudo ./ci/setup_ci_environment.sh - sudo ./ci/install_bazelisk.sh + ./ci/setup_ci_environment.sh + ./ci/install_bazelisk.sh - name: run tests run: ./ci/do_ci.sh bazel.tsan @@ -249,8 +249,8 @@ jobs: key: bazel_benchmark - name: setup run: | - sudo ./ci/setup_ci_environment.sh - sudo ./ci/install_bazelisk.sh + ./ci/setup_ci_environment.sh + ./ci/install_bazelisk.sh - name: run tests run: | env BENCHMARK_DIR=/benchmark @@ -267,7 +267,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo ./ci/install_format_tools.sh + run: ./ci/install_format_tools.sh - name: run tests run: ./ci/do_ci.sh format @@ -324,8 +324,8 @@ jobs: submodules: 'recursive' - name: setup run: | - sudo ./ci/setup_cmake.sh - sudo ./ci/setup_ci_environment.sh + ./ci/setup_cmake.sh + ./ci/setup_ci_environment.sh - name: run tests and generate report run: ./ci/do_ci.sh code.coverage - name: upload report @@ -341,7 +341,7 @@ jobs: uses: actions/checkout@v2 - name: install markdownlint-cli - run: sudo npm install -g markdownlint-cli + run: npm install -g markdownlint-cli - name: run markdownlint run: markdownlint . From fae5c08d8e979ad01f9f4824dbdf36c3fb11116c Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Sun, 23 May 2021 11:37:13 -0700 Subject: [PATCH 4/4] Revert "Remove sudo in ci.yml" This reverts commit 94411f2de73b94b58a2e1f41fa24135bc00af96a. --- .github/workflows/ci.yml | 64 ++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ce3f8fec1..29c27dde14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,11 +16,11 @@ jobs: submodules: 'recursive' - name: setup run: | - ./ci/setup_cmake.sh - ./ci/setup_ci_environment.sh + sudo ./ci/setup_cmake.sh + sudo ./ci/setup_ci_environment.sh - name: run cmake tests (without otlp-exporter) run: | - ./ci/setup_thrift.sh + sudo ./ci/setup_thrift.sh ./ci/do_ci.sh cmake.test cmake_gcc_48_test: @@ -32,11 +32,11 @@ jobs: submodules: 'recursive' - name: setup run: | - ./ci/setup_ci_environment.sh - ./ci/install_gcc48.sh + sudo ./ci/setup_ci_environment.sh + sudo ./ci/install_gcc48.sh - name: setup cmake run: | - CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/setup_cmake.sh + sudo CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/setup_cmake.sh - name: run tests run: ./ci/do_ci.sh cmake.legacy.test env: @@ -52,8 +52,8 @@ jobs: submodules: 'recursive' - name: setup run: | - ./ci/setup_ci_environment.sh - ./ci/setup_cmake.sh + sudo ./ci/setup_ci_environment.sh + sudo ./ci/setup_cmake.sh - name: run tests run: ./ci/do_ci.sh cmake.c++20.test @@ -66,11 +66,11 @@ jobs: submodules: 'recursive' - name: setup run: | - ./ci/setup_cmake.sh - ./ci/setup_ci_environment.sh + sudo ./ci/setup_cmake.sh + sudo ./ci/setup_ci_environment.sh - name: run otlp exporter tests run: | - ./ci/setup_grpc.sh + sudo ./ci/setup_grpc.sh ./ci/do_ci.sh cmake.exporter.otprotocol.test plugin_test: @@ -82,8 +82,8 @@ jobs: submodules: 'recursive' - name: setup run: | - ./ci/setup_cmake.sh - ./ci/setup_ci_environment.sh + sudo ./ci/setup_cmake.sh + sudo ./ci/setup_ci_environment.sh - name: run tests run: ./ci/do_ci.sh cmake.test_example_plugin @@ -103,9 +103,9 @@ jobs: key: bazel_gcc_48_test - name: setup run: | - ./ci/setup_ci_environment.sh - ./ci/install_bazelisk.sh - ./ci/install_gcc48.sh + sudo ./ci/setup_ci_environment.sh + sudo ./ci/install_bazelisk.sh + sudo ./ci/install_gcc48.sh - name: run tests run: ./ci/do_ci.sh bazel.legacy.test env: @@ -127,8 +127,8 @@ jobs: key: bazel_test - name: setup run: | - ./ci/setup_ci_environment.sh - ./ci/install_bazelisk.sh + sudo ./ci/setup_ci_environment.sh + sudo ./ci/install_bazelisk.sh - name: run tests run: ./ci/do_ci.sh bazel.test @@ -148,8 +148,8 @@ jobs: key: bazel_valgrind - name: setup run: | - ./ci/setup_ci_environment.sh - ./ci/install_bazelisk.sh + sudo ./ci/setup_ci_environment.sh + sudo ./ci/install_bazelisk.sh - name: run tests run: ./ci/do_ci.sh bazel.valgrind @@ -169,8 +169,8 @@ jobs: key: bazel_noexcept - name: setup run: | - ./ci/setup_ci_environment.sh - ./ci/install_bazelisk.sh + sudo ./ci/setup_ci_environment.sh + sudo ./ci/install_bazelisk.sh - name: run tests run: ./ci/do_ci.sh bazel.noexcept @@ -190,8 +190,8 @@ jobs: key: bazel_asan - name: setup run: | - ./ci/setup_ci_environment.sh - ./ci/install_bazelisk.sh + sudo ./ci/setup_ci_environment.sh + sudo ./ci/install_bazelisk.sh - name: run tests run: ./ci/do_ci.sh bazel.asan @@ -211,8 +211,8 @@ jobs: key: bazel_tsan - name: setup run: | - ./ci/setup_ci_environment.sh - ./ci/install_bazelisk.sh + sudo ./ci/setup_ci_environment.sh + sudo ./ci/install_bazelisk.sh - name: run tests run: ./ci/do_ci.sh bazel.tsan @@ -249,8 +249,8 @@ jobs: key: bazel_benchmark - name: setup run: | - ./ci/setup_ci_environment.sh - ./ci/install_bazelisk.sh + sudo ./ci/setup_ci_environment.sh + sudo ./ci/install_bazelisk.sh - name: run tests run: | env BENCHMARK_DIR=/benchmark @@ -267,7 +267,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: ./ci/install_format_tools.sh + run: sudo ./ci/install_format_tools.sh - name: run tests run: ./ci/do_ci.sh format @@ -324,8 +324,8 @@ jobs: submodules: 'recursive' - name: setup run: | - ./ci/setup_cmake.sh - ./ci/setup_ci_environment.sh + sudo ./ci/setup_cmake.sh + sudo ./ci/setup_ci_environment.sh - name: run tests and generate report run: ./ci/do_ci.sh code.coverage - name: upload report @@ -341,7 +341,7 @@ jobs: uses: actions/checkout@v2 - name: install markdownlint-cli - run: npm install -g markdownlint-cli + run: sudo npm install -g markdownlint-cli - name: run markdownlint run: markdownlint .