Skip to content

Update Telemetry to v1.3.1 and switch to header-only integration #311

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

Merged
SiskaPavel merged 2 commits into from
Oct 9, 2025
Merged

Update Telemetry to v1.3.1 and switch to header-only integration #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e7d87c
CMake: Remove telemetry::telemetry link dependency and include header…
Oct 9, 2025
07fc8f2
Telemetry: Update version to v1.3.1 and build library as static since…
Oct 9, 2025
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
4 changes: 2 additions & 2 deletions external/telemetry.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# - telemetry::telemetry (C++ library for telemetry data collection)
# - telemetry::appFs (C++ library that expose telemetry data as a Fuse filesystem)

set(TELEMETRY_BUILD_SHARED ON)
set(TELEMETRY_BUILD_SHARED OFF)
set(TELEMETRY_INSTALL_TARGETS OFF)
set(TELEMETRY_PACKAGE_BUILDER OFF)
set(TELEMETRY_ENABLE_TESTS OFF)
Expand All @@ -17,7 +17,7 @@ set(GIT_REPO https://github.com/CESNET/telemetry.git)
FetchContent_Declare(
telemetry
GIT_REPOSITORY ${GIT_REPO}
GIT_TAG v1.2.0
GIT_TAG v1.3.1
)

# Make sure that subproject accepts predefined build options without warnings.
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/input/dpdk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ target_include_directories(ipfixprobe-input-dpdk PRIVATE
${DPDK_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/include/
${CMAKE_SOURCE_DIR}/src/plugins/input/parser
${telemetry_SOURCE_DIR}/include
)

target_compile_options(ipfixprobe-input-dpdk PRIVATE ${DPDK_CFLAGS_OTHER})
target_compile_options(ipfixprobe-input-dpdk PRIVATE -Wno-volatile -Wno-pedantic)

target_link_libraries(ipfixprobe-input-dpdk PRIVATE
telemetry::telemetry
${DPDK_LIBRARIES}
)

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/input/nfb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ set_target_properties(ipfixprobe-input-nfb PROPERTIES
target_include_directories(ipfixprobe-input-nfb PRIVATE
${CMAKE_SOURCE_DIR}/include/
${CMAKE_SOURCE_DIR}/src/plugins/input/parser
${telemetry_SOURCE_DIR}/include
)

target_link_libraries(ipfixprobe-input-nfb PRIVATE
nfb::nfb
numa::numa
telemetry::telemetry
)

install(TARGETS ipfixprobe-input-nfb
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/input/pcap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ target_include_directories(ipfixprobe-input-pcap PRIVATE
${PCAP_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/include/
${CMAKE_SOURCE_DIR}/src/plugins/input/parser
${telemetry_SOURCE_DIR}/include
)

target_compile_definitions(ipfixprobe-input-pcap PRIVATE
Expand All @@ -23,7 +24,6 @@ target_compile_definitions(ipfixprobe-input-pcap PRIVATE

target_link_libraries(ipfixprobe-input-pcap PRIVATE
${PCAP_LIBRARIES}
telemetry::telemetry
)

install(TARGETS ipfixprobe-input-pcap
Expand Down
5 changes: 1 addition & 4 deletions src/plugins/input/raw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ set_target_properties(ipfixprobe-input-raw PROPERTIES
target_include_directories(ipfixprobe-input-raw PRIVATE
${CMAKE_SOURCE_DIR}/include/
${CMAKE_SOURCE_DIR}/src/plugins/input/parser
)

target_link_libraries(ipfixprobe-input-raw PRIVATE
telemetry::telemetry
${telemetry_SOURCE_DIR}/include
)

install(TARGETS ipfixprobe-input-raw
Expand Down
5 changes: 1 addition & 4 deletions src/plugins/storage/cache/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ set_target_properties(ipfixprobe-storage-cache PROPERTIES

target_include_directories(ipfixprobe-storage-cache PRIVATE
${CMAKE_SOURCE_DIR}/include/
)

target_link_libraries(ipfixprobe-storage-cache PRIVATE
telemetry::telemetry
${telemetry_SOURCE_DIR}/include
)

install(TARGETS ipfixprobe-storage-cache
Expand Down