Skip to content

Commit f5c979c

Browse files
authored
[fluentd] Add force_flush to fluentd exporters (open-telemetry#522)
1 parent b787a07 commit f5c979c

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

exporters/fluentd/CMakeLists.txt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,22 @@ if(OPENTELEMETRY_INSTALL)
133133
endif()
134134

135135
if(BUILD_TESTING)
136-
include(GoogleTest)
136+
if(MAIN_PROJECT)
137+
find_package(GTest CONFIG REQUIRED)
138+
else()
139+
if (NOT DEFINED GTEST_BOTH_LIBRARIES)
140+
message(STATUS_FATAL, "Test is not enable.")
141+
endif()
142+
endif()
143+
# include(GoogleTest)
137144
# build trace exporter tests
138145
add_executable(
139146
fluentd_recordable_trace_test test/trace/fluentd_recordable_test.cc
140147
test/trace/fluentd_baseline_test.cc)
141148

142149
target_link_libraries(
143150
fluentd_recordable_trace_test
144-
gtest
145-
gtest_main
151+
${GTEST_BOTH_LIBRARIES}
146152
${CMAKE_THREAD_LIBS_INIT}
147153
opentelemetry_common
148154
opentelemetry_trace
@@ -164,8 +170,7 @@ if(BUILD_TESTING)
164170

165171
target_link_libraries(
166172
fluentd_recordable_logs_test
167-
gtest
168-
gtest_main
173+
${GTEST_BOTH_LIBRARIES}
169174
${CMAKE_THREAD_LIBS_INIT}
170175
opentelemetry_common
171176
opentelemetry_logs

exporters/fluentd/include/opentelemetry/exporters/fluentd/log/fluentd_exporter.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ class FluentdExporter final : public logs_sdk::LogRecordExporter {
5050
Export(const nostd::span<std::unique_ptr<logs_sdk::Recordable>>
5151
&logs) noexcept override;
5252

53+
bool ForceFlush(
54+
std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
55+
{
56+
return true;
57+
}
58+
5359
/**
5460
* Shut down the exporter.
5561
* @param timeout an optional timeout, default to max.

exporters/fluentd/include/opentelemetry/exporters/fluentd/trace/fluentd_exporter.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ class FluentdExporter final : public trace_sdk::SpanExporter {
5555
Export(const nostd::span<std::unique_ptr<trace_sdk::Recordable>>
5656
&spans) noexcept override;
5757

58+
bool ForceFlush(
59+
std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
60+
{
61+
return true;
62+
}
63+
5864
/**
5965
* Shut down the exporter.
6066
* @param timeout an optional timeout, default to max.

0 commit comments

Comments
 (0)