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

Fix cmake find config of fluentd and update corresponding README #478

Merged
merged 1 commit into from
Aug 29, 2024
Merged

Fix cmake find config of fluentd and update corresponding README #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions exporters/fluentd/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,21 @@ For example:
$ .../opentelemetry-cpp-contrib2/exporters/fluentd$ make
```

### Incorporating into an existing CMake Project

To use the library from a CMake project, you can locate it directly with
`find_package` and use the imported targets from generated package
configurations. As of now, this will import targets for both `trace` and `logs`.

```cmake
# CMakeLists.txt
find_package(opentelemetry-cpp CONFIG REQUIRED)
find_package(opentelemetry-fluentd CONFIG REQUIRED)
...
target_include_directories(foo PRIVATE ${OPENTELEMETRY_CPP_FLUENTD_INCLUDE_DIRS})
target_link_libraries(foo PRIVATE ${OPENTELEMETRY_CPP_LIBRARIES} ${OPENTELEMETRY_CPP_FLUENTD_LIBRARY_DIRS})
```

### Bazel Install Instructions

TODO
Expand Down
8 changes: 4 additions & 4 deletions exporters/fluentd/cmake/opentelemetry-cpp-fluentd-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
# OPENTELEMETRY_CPP_FLUENTD_VERSION - Version of opentelemetry-cpp-fluentd.
#
# ::
# opentelemetry-cpp-fluentd::trace - Imported target of opentelemetry-cpp-fluentd::trace
# opentelemetry-cpp::logs - Imported target of opentelemetry-cpp-fluentd::logs
# opentelemetry-cpp-fluentd::trace - Imported target of opentelemetry-fluentd::trace
# opentelemetry-cpp::logs - Imported target of opentelemetry-fluentd::logs

# =============================================================================
# Copyright 2020 opentelemetry.
Expand Down Expand Up @@ -49,8 +49,8 @@ set(_OPENTELEMETRY_CPP_FLUENTD_LIBRARIES_TEST_TARGETS
logs)

foreach(_TEST_TARGET IN LISTS _OPENTELEMETRY_CPP_FLUENTD_LIBRARIES_TEST_TARGETS)
if(TARGET opentelemetry-fluentd-cpp::${_TEST_TARGET})
list(APPEND OPENTELEMETRY_CPP_FLUENTD_LIBRARIES opentelemetry-cpp-fluentd::${_TEST_TARGET})
if(TARGET opentelemetry-fluentd::${_TEST_TARGET})
list(APPEND OPENTELEMETRY_CPP_FLUENTD_LIBRARIES opentelemetry-fluentd::${_TEST_TARGET})
else()
message("Target not found: " ${_TEST_TARGET})
endif()
Expand Down
Loading