From 4e7d87c5771f5b711a2c5f34d378e3e2bc8df205 Mon Sep 17 00:00:00 2001
From: Pavel Siska <xsiska12@ta-devel.liberouter.org>
Date: Thu, 9 Oct 2025 15:05:49 +0200
Subject: [PATCH 1/2] CMake: Remove telemetry::telemetry link dependency and
 include headers directly to CMake modules

---
 src/plugins/input/dpdk/CMakeLists.txt    | 2 +-
 src/plugins/input/nfb/CMakeLists.txt     | 2 +-
 src/plugins/input/pcap/CMakeLists.txt    | 2 +-
 src/plugins/input/raw/CMakeLists.txt     | 5 +----
 src/plugins/storage/cache/CMakeLists.txt | 5 +----
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/plugins/input/dpdk/CMakeLists.txt b/src/plugins/input/dpdk/CMakeLists.txt
index 2a6f8a944..be84e39d1 100644
--- a/src/plugins/input/dpdk/CMakeLists.txt
+++ b/src/plugins/input/dpdk/CMakeLists.txt
@@ -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}
 )
 
diff --git a/src/plugins/input/nfb/CMakeLists.txt b/src/plugins/input/nfb/CMakeLists.txt
index 03086c023..da2b63acf 100644
--- a/src/plugins/input/nfb/CMakeLists.txt
+++ b/src/plugins/input/nfb/CMakeLists.txt
@@ -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
diff --git a/src/plugins/input/pcap/CMakeLists.txt b/src/plugins/input/pcap/CMakeLists.txt
index 83b811e60..8551a6ee2 100644
--- a/src/plugins/input/pcap/CMakeLists.txt
+++ b/src/plugins/input/pcap/CMakeLists.txt
@@ -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
@@ -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
diff --git a/src/plugins/input/raw/CMakeLists.txt b/src/plugins/input/raw/CMakeLists.txt
index 9a8d5c0a3..d93cb1493 100644
--- a/src/plugins/input/raw/CMakeLists.txt
+++ b/src/plugins/input/raw/CMakeLists.txt
@@ -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
diff --git a/src/plugins/storage/cache/CMakeLists.txt b/src/plugins/storage/cache/CMakeLists.txt
index 5a8623619..2ee3d36c1 100644
--- a/src/plugins/storage/cache/CMakeLists.txt
+++ b/src/plugins/storage/cache/CMakeLists.txt
@@ -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

From 07fc8f2a5a0993a47052f2c19c7f0f903852860e Mon Sep 17 00:00:00 2001
From: Pavel Siska <xsiska12@ta-devel.liberouter.org>
Date: Thu, 9 Oct 2025 15:03:22 +0200
Subject: [PATCH 2/2] Telemetry: Update version to v1.3.1 and build library as
 static since shared variant is no longer needed Static variant no longer
 cause ODR errors

---
 external/telemetry.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/telemetry.cmake b/external/telemetry.cmake
index 8094a301d..af9f37e73 100644
--- a/external/telemetry.cmake
+++ b/external/telemetry.cmake
@@ -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)
@@ -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.