Skip to content

Commit e796881

Browse files
lalitblalitb
authored
Upgrade fluentd exporter to use latest otel-cpp (#309)
1 parent 866351c commit e796881

File tree

11 files changed

+53
-24
lines changed

11 files changed

+53
-24
lines changed

‎exporters/fluentd/CMakeLists.txt‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
2222
project(opentelemetry-fluentd)
2323
set(MAIN_PROJECT ON)
2424
endif()
25-
add_definitions(-DHAVE_CONSOLE_LOG)
26-
add_definitions(-DENABLE_LOGS_PREVIEW)
2725

2826
if (MAIN_PROJECT)
2927
find_package(opentelemetry-cpp CONFIG QUIET)
@@ -34,7 +32,7 @@ if (MAIN_PROJECT)
3432
build_opentelemetry()
3533
set(OPENTELEMETRY_CPP_INCLUDE_DIRS "")
3634
set(OPENTELEMETRY_CPP_LIBRARIES "opentelemetry::libopentelemetry")
37-
message("\nopentelemetry-cpp package was not found. Cloned from github")
35+
message("opentelemetry-cpp package was not found. Cloned from github")
3836
endif()
3937
endif()
4038

@@ -48,7 +46,7 @@ else()
4846
set(nlohmann_json_SOURCE_DIR
4947
"${CMAKE_SOURCE_DIR}/nlohmann_json/single_include")
5048
include_directories(${nlohmann_json_SOURCE_DIR})
51-
message("\nnlohmann_json package was not found. Cloning from github")
49+
message("nlohmann_json package was not found. Cloning from github")
5250
endif()
5351

5452
find_package(CURL REQUIRED)
@@ -58,28 +56,42 @@ include_directories(include)
5856
# create fluentd trace exporter
5957
add_library(opentelemetry_exporter_fluentd_trace src/trace/fluentd_exporter.cc
6058
src/trace/recordable.cc)
61-
target_include_directories(opentelemetry_exporter_fluentd_trace
59+
if(MAIN_PROJECT)
60+
target_include_directories(opentelemetry_exporter_fluentd_trace
6261
PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS})
63-
target_link_libraries(
64-
opentelemetry_exporter_fluentd_trace
65-
PUBLIC ${OPENTELEMETRY_CPP_LIBRARIES}
66-
INTERFACE nlohmann_json::nlohmann_json)
62+
target_link_libraries(
63+
opentelemetry_exporter_fluentd_trace
64+
PUBLIC ${OPENTELEMETRY_CPP_LIBRARIES}
65+
INTERFACE nlohmann_json::nlohmann_json)
66+
else()
67+
target_link_libraries(
68+
opentelemetry_exporter_fluentd_trace
69+
PUBLIC opentelemetry_trace opentelemetry_resources opentelemetry_common
70+
INTERFACE nlohmann_json::nlohmann_json)
71+
endif()
72+
6773
set_target_properties(opentelemetry_exporter_fluentd_trace
6874
PROPERTIES EXPORT_NAME trace)
6975

7076
# create fluentd logs exporter
7177

7278
add_library(opentelemetry_exporter_fluentd_logs src/log/fluentd_exporter.cc
7379
src/log/recordable.cc)
74-
target_include_directories(opentelemetry_exporter_fluentd_logs
80+
if(MAIN_PROJECT)
81+
target_include_directories(opentelemetry_exporter_fluentd_logs
7582
PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS})
76-
target_link_libraries(
77-
opentelemetry_exporter_fluentd_logs
78-
PUBLIC ${OPENTELEMETRY_CPP_LIBRARIES}
79-
INTERFACE nlohmann_json::nlohmann_json)
83+
target_link_libraries(
84+
opentelemetry_exporter_fluentd_logs
85+
PUBLIC ${OPENTELEMETRY_CPP_LIBRARIES}
86+
INTERFACE nlohmann_json::nlohmann_json)
87+
else()
88+
target_link_libraries(
89+
opentelemetry_exporter_fluentd_logs
90+
PUBLIC opentelemetry_logs opentelemetry_resources opentelemetry_common
91+
INTERFACE nlohmann_json::nlohmann_json)
92+
endif()
8093
set_target_properties(opentelemetry_exporter_fluentd_logs PROPERTIES EXPORT_NAME
8194
logs)
82-
8395
if(nlohmann_json_clone)
8496
add_dependencies(opentelemetry_exporter_fluentd_trace
8597
nlohmann_json::nlohmann_json)

‎exporters/fluentd/example/CMakeLists.txt‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,24 @@ target_link_libraries(foo_library_trace opentelemetry_exporter_fluentd_trace
66
${CMAKE_THREAD_LIBS_INIT})
77

88
add_executable(fluentd_example_trace trace/main.cc)
9-
target_link_libraries(fluentd_example_trace ${CMAKE_THREAD_LIBS_INIT}
9+
if(MAIN_PROJECT)
10+
target_link_libraries(fluentd_example_trace ${CMAKE_THREAD_LIBS_INIT}
1011
foo_library_trace opentelemetry-cpp::trace)
12+
else()
13+
target_link_libraries(fluentd_example_trace ${CMAKE_THREAD_LIBS_INIT}
14+
foo_library_trace opentelemetry_trace)
15+
endif()
1116

1217
add_library(foo_library_logs log/foo_library/foo_library.cc)
1318

1419
target_link_libraries(foo_library_logs opentelemetry_exporter_fluentd_logs
1520
${CMAKE_THREAD_LIBS_INIT})
1621

1722
add_executable(fluentd_example_logs log/main.cc)
18-
target_link_libraries(fluentd_example_logs ${CMAKE_THREAD_LIBS_INIT}
23+
if(MAIN_PROJECT)
24+
target_link_libraries(fluentd_example_logs ${CMAKE_THREAD_LIBS_INIT}
1925
foo_library_logs opentelemetry-cpp::logs)
26+
else()
27+
target_link_libraries(fluentd_example_logs ${CMAKE_THREAD_LIBS_INIT}
28+
foo_library_logs opentelemetry_logs)
29+
endif()

‎exporters/fluentd/example/log/foo_library/foo_library.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#define ENABLE_LOGS_PREVIEW
54
#include "opentelemetry/logs/provider.h"
65

76
namespace logs = opentelemetry::logs;

‎exporters/fluentd/include/opentelemetry/exporters/fluentd/common/fluentd_common.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212

1313
#include <chrono>
1414

15+
#ifndef ENABLE_LOGS_PREVIEW
16+
#define ENABLE_LOGS_PREVIEW 1
17+
#endif
18+
1519
OPENTELEMETRY_BEGIN_NAMESPACE
1620
namespace exporter {
1721
namespace fluentd {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33
#pragma once
44

5-
#define ENABLE_LOGS_PREVIEW 1
6-
75
#include "opentelemetry/exporters/fluentd/common/socket_tools.h"
86

97
#include "opentelemetry/exporters/fluentd/trace/recordable.h"

‎exporters/fluentd/include/opentelemetry/exporters/fluentd/log/recordable.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#pragma once
55

6-
#define ENABLE_LOGS_PREVIEW 1
7-
86
#include "nlohmann/json.hpp"
97
#include "opentelemetry/sdk/common/attribute_utils.h"
108
#include "opentelemetry/sdk/logs/recordable.h"

‎exporters/fluentd/src/log/fluentd_exporter.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
3+
#ifndef HAVE_CONSOLE_LOG
34
#define HAVE_CONSOLE_LOG
5+
#endif
46

57
#include "opentelemetry/exporters/fluentd/log/fluentd_exporter.h"
68
#include "opentelemetry/exporters/fluentd/log/recordable.h"

‎exporters/fluentd/src/log/recordable.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
#include "opentelemetry/exporters/fluentd/common/fluentd_common.h"
66
#include "opentelemetry/exporters/fluentd/common/fluentd_logging.h"
77

8+
#include "opentelemetry/logs/severity.h"
9+
#include "opentelemetry/trace/span_id.h"
10+
#include "opentelemetry/trace/trace_id.h"
11+
812
#include <chrono>
913
#include <map>
1014

‎exporters/fluentd/src/trace/fluentd_exporter.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ bool FluentdExporter::Send(std::vector<uint8_t> &packet) {
248248
return true;
249249
}
250250

251-
LOG_WARN("send failed, retrying %u ...", retryCount);
251+
LOG_WARN("send failed, retrying %u ...", (unsigned int)retryCount);
252252
// Retry to connect and/or send
253253
}
254254

‎exporters/fluentd/src/trace/recordable.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
#include "opentelemetry/exporters/fluentd/common/fluentd_common.h"
66
#include "opentelemetry/exporters/fluentd/common/fluentd_logging.h"
77

8+
#include "opentelemetry/sdk/resource/resource.h"
9+
810
#include <map>
911
#include <string>
1012

0 commit comments

Comments
 (0)