Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Address spec compliance issue (SetName method is deprecated and removed) #183

Merged
merged 3 commits into from
Jun 30, 2022
Merged

Address spec compliance issue (SetName method is deprecated and removed) #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ae6f72
Address spec compliance issue (SetName method is deprecated and remov…
maxgolov Jun 30, 2022
09b7982
Update version to 1.1.2 to reflect the log recordable API change
maxgolov Jun 30, 2022
e6fb218
Update to latest OpenTelemetry C++ SDK release tag
maxgolov Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 51 additions & 41 deletions exporters/fluentd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,28 @@

cmake_minimum_required(VERSION 3.12)

project(opentelemetry-fluentd)

# MAIN_PROJECT CHECK
## determine if fluentd exporter is built as a subproject (using add_subdirectory) or if it is the main project
##
set(MAIN_PROJECT OFF)
lalitb marked this conversation as resolved.
Show resolved Hide resolved
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
project(opentelemetry-fluentd)
set(MAIN_PROJECT ON)
endif()
add_definitions(-DHAVE_CONSOLE_LOG)
add_definitions(-DENABLE_LOGS_PREVIEW)

find_package(opentelemetry-cpp QUIET)
if(opentelemetry_cpp_FOUND)
message("Using external opentelemetry-cpp")
else()
include(cmake/opentelemetry-cpp.cmake)
build_opentelemetry()
set(OPENTELEMETRY_CPP_INCLUDE_DIRS "")
set(OPENTELEMETRY_CPP_LIBRARIES "opentelemetry::libopentelemetry")
message("\nopentelemetry-cpp package was not found. Cloned from github")
if (MAIN_PROJECT)
find_package(opentelemetry-cpp QUIET)
if(opentelemetry_cpp_FOUND)
message("Using external opentelemetry-cpp")
else()
include(cmake/opentelemetry-cpp.cmake)
build_opentelemetry()
set(OPENTELEMETRY_CPP_INCLUDE_DIRS "")
set(OPENTELEMETRY_CPP_LIBRARIES "opentelemetry::libopentelemetry")
message("\nopentelemetry-cpp package was not found. Cloned from github")
endif()
endif()

find_package(nlohmann_json QUIET)
Expand Down Expand Up @@ -151,36 +159,38 @@ if(BUILD_TESTING)
TEST_LIST fluentd_recordable_logs_test)
endif() # BUILD_TESTING

# config file for find_packages(opentelemetry-cpp-fluentd CONFIG)
include(GNUInstallDirs)
include(CMakePackageConfigHelpers)

set(OPENTELEMETRY_CPP_FLUENTD_VERSION "1.1.1")
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
configure_package_config_file(
"${CMAKE_CURRENT_LIST_DIR}/cmake/opentelemetry-cpp-fluentd-config.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake"
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
# PATH_VARS OPENTELEMETRY_CPP_FLUENTD_VERSION PROJECT_NAME INCLUDE_INSTALL_DIR
# CMAKE_INSTALL_LIBDIR
PATH_VARS PROJECT_NAME INCLUDE_INSTALL_DIR CMAKE_INSTALL_LIBDIR
NO_CHECK_REQUIRED_COMPONENTS_MACRO)

# Write version file for find_packages(opentelemetry-cpp-fluentd CONFIG)
write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config-version.cmake"
VERSION ${OPENTELEMETRY_CPP_FLUENTD_VERSION}
COMPATIBILITY ExactVersion)
if (MAIN_PROJECT)
# config file for find_packages(opentelemetry-cpp-fluentd CONFIG)
include(GNUInstallDirs)
include(CMakePackageConfigHelpers)

install(
FILES
set(OPENTELEMETRY_CPP_FLUENTD_VERSION "1.1.2")
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
configure_package_config_file(
"${CMAKE_CURRENT_LIST_DIR}/cmake/opentelemetry-cpp-fluentd-config.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake"
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
# PATH_VARS OPENTELEMETRY_CPP_FLUENTD_VERSION PROJECT_NAME INCLUDE_INSTALL_DIR
# CMAKE_INSTALL_LIBDIR
PATH_VARS PROJECT_NAME INCLUDE_INSTALL_DIR CMAKE_INSTALL_LIBDIR
NO_CHECK_REQUIRED_COMPONENTS_MACRO)

# Write version file for find_packages(opentelemetry-cpp-fluentd CONFIG)
write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config-version.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")

# Export all components
export(
EXPORT "${PROJECT_NAME}-target"
NAMESPACE "${PROJECT_NAME}::"
FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-target.cmake"
)
VERSION ${OPENTELEMETRY_CPP_FLUENTD_VERSION}
COMPATIBILITY ExactVersion)

install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config-version.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")

# Export all components
export(
EXPORT "${PROJECT_NAME}-target"
NAMESPACE "${PROJECT_NAME}::"
FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-target.cmake"
)
endif()
2 changes: 1 addition & 1 deletion exporters/fluentd/cmake/opentelemetry-cpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if("${opentelemetry-cpp-tag}" STREQUAL "")
set(opentelemetry-cpp-tag "75c2a8f7a6bf81d9799e76804473609cc236b7be") #to incorporate PR#1325
set(opentelemetry-cpp-tag "96534a7c2370099ada8bd9dcdc7236c76adf47d9") # OpenTelemetry C++ v1.4.1
endif()
function(target_create _target _lib)
add_library(${_target} STATIC IMPORTED)
Expand Down
3 changes: 3 additions & 0 deletions exporters/fluentd/example/log/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@

namespace sdk_logs = opentelemetry::sdk::logs;
namespace nostd = opentelemetry::nostd;

#ifndef HAVE_CONSOLE_LOG
#define HAVE_CONSOLE_LOG
#endif

namespace {
void initLogger() {
Expand Down
2 changes: 2 additions & 0 deletions exporters/fluentd/example/trace/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
namespace sdktrace = opentelemetry::sdk::trace;
namespace nostd = opentelemetry::nostd;

#ifndef HAVE_CONSOLE_LOG
#define HAVE_CONSOLE_LOG
#endif

namespace {
void initTracer() {
Expand Down
2 changes: 1 addition & 1 deletion exporters/fluentd/include/opentelemetry/exporters/fluentd/log/recordable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Recordable final : public opentelemetry::sdk::logs::Recordable {
* Set name for this log
* @param name the name to set
*/
void SetName(nostd::string_view name) noexcept override;
void SetName(nostd::string_view name) noexcept;

/**
* Set body field for this log.
Expand Down