diff --git a/exporters/fluentd/CMakeLists.txt b/exporters/fluentd/CMakeLists.txt index f869fda09..47ceaea75 100644 --- a/exporters/fluentd/CMakeLists.txt +++ b/exporters/fluentd/CMakeLists.txt @@ -133,7 +133,14 @@ if(OPENTELEMETRY_INSTALL) endif() if(BUILD_TESTING) - include(GoogleTest) + if(MAIN_PROJECT) + find_package(GTest CONFIG REQUIRED) + else() + if (NOT DEFINED GTEST_BOTH_LIBRARIES) + message(STATUS_FATAL, "Test is not enable.") + endif() + endif() + # include(GoogleTest) # build trace exporter tests add_executable( fluentd_recordable_trace_test test/trace/fluentd_recordable_test.cc @@ -141,8 +148,7 @@ if(BUILD_TESTING) target_link_libraries( fluentd_recordable_trace_test - gtest - gtest_main + ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} opentelemetry_common opentelemetry_trace @@ -164,8 +170,7 @@ if(BUILD_TESTING) target_link_libraries( fluentd_recordable_logs_test - gtest - gtest_main + ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} opentelemetry_common opentelemetry_logs diff --git a/exporters/fluentd/include/opentelemetry/exporters/fluentd/log/fluentd_exporter.h b/exporters/fluentd/include/opentelemetry/exporters/fluentd/log/fluentd_exporter.h index 05f661404..2d201376c 100644 --- a/exporters/fluentd/include/opentelemetry/exporters/fluentd/log/fluentd_exporter.h +++ b/exporters/fluentd/include/opentelemetry/exporters/fluentd/log/fluentd_exporter.h @@ -50,6 +50,12 @@ class FluentdExporter final : public logs_sdk::LogRecordExporter { Export(const nostd::span> &logs) noexcept override; + bool ForceFlush( + std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override + { + return true; + } + /** * Shut down the exporter. * @param timeout an optional timeout, default to max. diff --git a/exporters/fluentd/include/opentelemetry/exporters/fluentd/trace/fluentd_exporter.h b/exporters/fluentd/include/opentelemetry/exporters/fluentd/trace/fluentd_exporter.h index 6e71a0299..d3478710e 100644 --- a/exporters/fluentd/include/opentelemetry/exporters/fluentd/trace/fluentd_exporter.h +++ b/exporters/fluentd/include/opentelemetry/exporters/fluentd/trace/fluentd_exporter.h @@ -55,6 +55,12 @@ class FluentdExporter final : public trace_sdk::SpanExporter { Export(const nostd::span> &spans) noexcept override; + bool ForceFlush( + std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override + { + return true; + } + /** * Shut down the exporter. * @param timeout an optional timeout, default to max.