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 f8bfe4bf96..2e581ea316 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -34,6 +34,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 100755 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 c6467baf51..23f0d3d5f3 100644 --- a/exporters/jaeger/src/thrift_sender.h +++ b/exporters/jaeger/src/thrift_sender.h @@ -3,7 +3,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 96411e0681..b75987e4a5 100644 --- a/exporters/jaeger/src/udp_transport.h +++ b/exporters/jaeger/src/udp_transport.h @@ -6,7 +6,7 @@ #include "TUDPTransport.h" #include "transport.h" -#include +#include #include #include #include