From 3a074f53a586a4d6fcfc1a9c4f1b0a658e4cccb9 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 10 Jun 2025 13:48:43 -0700 Subject: [PATCH 1/3] [Geneva] Make EXPORT_NAME consistent --- exporters/fluentd/CMakeLists.txt | 16 +++---- exporters/geneva-trace/CMakeLists.txt | 16 +++---- exporters/geneva/CMakeLists.txt | 62 +++++++++++++-------------- exporters/user_events/CMakeLists.txt | 42 +++++++++--------- 4 files changed, 66 insertions(+), 70 deletions(-) diff --git a/exporters/fluentd/CMakeLists.txt b/exporters/fluentd/CMakeLists.txt index ada242cc6..60b90f884 100644 --- a/exporters/fluentd/CMakeLists.txt +++ b/exporters/fluentd/CMakeLists.txt @@ -117,6 +117,14 @@ if (WITH_EXAMPLES) endif() if(OPENTELEMETRY_INSTALL) + set_target_properties( + opentelemetry_exporter_geneva_trace + PROPERTIES + EXPORT_NAME opentelemetry_exporter_geneva_trace) + set_target_properties( + opentelemetry_exporter_geneva_logs + PROPERTIES + EXPORT_NAME opentelemetry_exporter_geneva_logs) if(MAIN_PROJECT) install( TARGETS opentelemetry_exporter_geneva_logs @@ -132,14 +140,6 @@ if(OPENTELEMETRY_INSTALL) FILES_MATCHING PATTERN "*.h") else() - set_target_properties( - opentelemetry_exporter_geneva_trace - PROPERTIES - EXPORT_NAME opentelemetry_exporter_geneva_trace) - set_target_properties( - opentelemetry_exporter_geneva_logs - PROPERTIES - EXPORT_NAME opentelemetry_exporter_geneva_logs) otel_add_component( COMPONENT exporters_geneva_fluentd diff --git a/exporters/geneva-trace/CMakeLists.txt b/exporters/geneva-trace/CMakeLists.txt index 167822d07..cda6703d0 100644 --- a/exporters/geneva-trace/CMakeLists.txt +++ b/exporters/geneva-trace/CMakeLists.txt @@ -30,6 +30,13 @@ if(WITH_EXAMPLES) endif() if(OPENTELEMETRY_INSTALL) + set_target_properties( + opentelemetry_exporter_geneva_trace + PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_trace) + set_target_properties( + opentelemetry_exporter_geneva_logs + PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_logs) + if(MAIN_PROJECT) install(DIRECTORY include/ DESTINATION include) @@ -44,13 +51,6 @@ if(OPENTELEMETRY_INSTALL) DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") endif() else() - set_target_properties( - opentelemetry_exporter_geneva_trace - PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_trace) - set_target_properties( - opentelemetry_exporter_geneva_logs - PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_logs) - otel_add_component( COMPONENT exporters_geneva_trace_logs @@ -60,7 +60,7 @@ if(OPENTELEMETRY_INSTALL) FILES_DIRECTORY "include/opentelemetry/exporters/geneva" FILES_DESTINATION - "include/opentelemetry/exporters/geneva" + "include/opentelemetry/exporters" FILES_MATCHING PATTERN "*.h") diff --git a/exporters/geneva/CMakeLists.txt b/exporters/geneva/CMakeLists.txt index 10548706a..a254c6b07 100644 --- a/exporters/geneva/CMakeLists.txt +++ b/exporters/geneva/CMakeLists.txt @@ -91,40 +91,36 @@ if(BUILD_TESTING) endif() if(OPENTELEMETRY_INSTALL) - -if(MAIN_PROJECT) - - install( - TARGETS opentelemetry_exporter_geneva_metrics - EXPORT "${PROJECT_NAME}-target" - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - install( - DIRECTORY include/opentelemetry/exporters/geneva - DESTINATION include/opentelemetry/exporters - FILES_MATCHING - PATTERN "*.h") - -else() - - set_target_properties(opentelemetry_exporter_geneva_metrics PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_metrics) - - otel_add_component( - COMPONENT - exporters_geneva_metrics - TARGETS + set_targt_properties( opentelemetry_exporter_geneva_metrics - FILES_DIRECTORY - "include/opentelemetry/exporters/geneva" - FILES_DESTINATION - "include/opentelemetry/exporters" - FILES_MATCHING - PATTERN - "*.h") - -endif() + PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_metrics) + if(MAIN_PROJECT) + install( + TARGETS opentelemetry_exporter_geneva_metrics + EXPORT "${PROJECT_NAME}-target" + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + install( + DIRECTORY include/opentelemetry/exporters/geneva + DESTINATION include/opentelemetry/exporters + FILES_MATCHING + PATTERN "*.h") + else() + otel_add_component( + COMPONENT + exporters_geneva_metrics + TARGETS + opentelemetry_exporter_geneva_metrics + FILES_DIRECTORY + "include/opentelemetry/exporters/geneva" + FILES_DESTINATION + "include/opentelemetry/exporters" + FILES_MATCHING + PATTERN + "*.h") + endif() endif() if(WITH_EXAMPLES) diff --git a/exporters/user_events/CMakeLists.txt b/exporters/user_events/CMakeLists.txt index b2576f714..45b3dd8d0 100644 --- a/exporters/user_events/CMakeLists.txt +++ b/exporters/user_events/CMakeLists.txt @@ -136,29 +136,29 @@ if(WITH_BENCHMARK) opentelemetry_exporter_user_events_logs) endif() -if(MAIN_PROJECT) +set_target_properties( + opentelemetry_exporter_user_events_logs + PROPERTIES + EXPORT_NAME opentelemetry_exporter_user_events_logs) +set_target_properties( + opentelemetry_exporter_user_events_metrics + PROPERTIES + EXPORT_NAME opentelemetry_exporter_user_events_metrics) -install( - TARGETS opentelemetry_exporter_user_events_logs - EXPORT "${PROJECT_NAME}-target" - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -install( - DIRECTORY include/opentelemetry/exporters/user_events - DESTINATION include/opentelemetry/exporters - FILES_MATCHING - PATTERN "*.h") +if(MAIN_PROJECT) + install( + TARGETS opentelemetry_exporter_user_events_logs + EXPORT "${PROJECT_NAME}-target" + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + install( + DIRECTORY include/opentelemetry/exporters/user_events + DESTINATION include/opentelemetry/exporters + FILES_MATCHING + PATTERN "*.h") else() - set_target_properties( - opentelemetry_exporter_user_events_logs - PROPERTIES - EXPORT_NAME opentelemetry_exporter_user_events_logs) - set_target_properties( - opentelemetry_exporter_user_events_metrics - PROPERTIES - EXPORT_NAME opentelemetry_exporter_user_events_metrics) otel_add_component( COMPONENT exporters_user_events From db8ee8fdef09f6ec02e2424b2b2529470e05d074 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 10 Jun 2025 13:53:04 -0700 Subject: [PATCH 2/3] Fix typo --- exporters/geneva/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporters/geneva/CMakeLists.txt b/exporters/geneva/CMakeLists.txt index a254c6b07..9e764a5a8 100644 --- a/exporters/geneva/CMakeLists.txt +++ b/exporters/geneva/CMakeLists.txt @@ -91,7 +91,7 @@ if(BUILD_TESTING) endif() if(OPENTELEMETRY_INSTALL) - set_targt_properties( + set_target_properties( opentelemetry_exporter_geneva_metrics PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_metrics) if(MAIN_PROJECT) From 04e5fe555cbf8e60605fc363bb66fd98fcbd7792 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 10 Jun 2025 14:18:35 -0700 Subject: [PATCH 3/3] Address feedback --- exporters/fluentd/CMakeLists.txt | 16 ++++++++-------- exporters/geneva-trace/CMakeLists.txt | 14 +++++++------- exporters/geneva/CMakeLists.txt | 7 ++++--- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/exporters/fluentd/CMakeLists.txt b/exporters/fluentd/CMakeLists.txt index 60b90f884..646e29a4d 100644 --- a/exporters/fluentd/CMakeLists.txt +++ b/exporters/fluentd/CMakeLists.txt @@ -63,6 +63,10 @@ endif() # create fluentd trace exporter add_library(opentelemetry_exporter_geneva_trace src/trace/fluentd_exporter.cc src/trace/recordable.cc) +set_target_properties( + opentelemetry_exporter_geneva_trace + PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_trace) + if(MAIN_PROJECT) target_include_directories(opentelemetry_exporter_geneva_trace PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS}) @@ -83,6 +87,10 @@ endif() add_library(opentelemetry_exporter_geneva_logs src/log/fluentd_exporter.cc src/log/recordable.cc) +set_target_properties( + opentelemetry_exporter_geneva_logs + PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_logs) + if(MAIN_PROJECT) target_include_directories(opentelemetry_exporter_geneva_logs PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS}) @@ -117,14 +125,6 @@ if (WITH_EXAMPLES) endif() if(OPENTELEMETRY_INSTALL) - set_target_properties( - opentelemetry_exporter_geneva_trace - PROPERTIES - EXPORT_NAME opentelemetry_exporter_geneva_trace) - set_target_properties( - opentelemetry_exporter_geneva_logs - PROPERTIES - EXPORT_NAME opentelemetry_exporter_geneva_logs) if(MAIN_PROJECT) install( TARGETS opentelemetry_exporter_geneva_logs diff --git a/exporters/geneva-trace/CMakeLists.txt b/exporters/geneva-trace/CMakeLists.txt index cda6703d0..48b4c9ae6 100644 --- a/exporters/geneva-trace/CMakeLists.txt +++ b/exporters/geneva-trace/CMakeLists.txt @@ -17,12 +17,19 @@ target_include_directories( opentelemetry_exporter_geneva_trace INTERFACE $ $) +set_target_properties( + opentelemetry_exporter_geneva_trace + PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_trace) add_library(opentelemetry_exporter_geneva_logs INTERFACE) target_include_directories( opentelemetry_exporter_geneva_logs INTERFACE $ $) +set_target_properties( + opentelemetry_exporter_geneva_logs + PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_logs) + if(WITH_EXAMPLES) include_directories(include) @@ -30,13 +37,6 @@ if(WITH_EXAMPLES) endif() if(OPENTELEMETRY_INSTALL) - set_target_properties( - opentelemetry_exporter_geneva_trace - PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_trace) - set_target_properties( - opentelemetry_exporter_geneva_logs - PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_logs) - if(MAIN_PROJECT) install(DIRECTORY include/ DESTINATION include) diff --git a/exporters/geneva/CMakeLists.txt b/exporters/geneva/CMakeLists.txt index 9e764a5a8..b01130c13 100644 --- a/exporters/geneva/CMakeLists.txt +++ b/exporters/geneva/CMakeLists.txt @@ -44,6 +44,10 @@ else() src/exporter.cc src/unix_domain_socket_data_transport.cc) endif() +set_target_properties( + opentelemetry_exporter_geneva_metrics + PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_metrics) + if(MAIN_PROJECT) target_include_directories(opentelemetry_exporter_geneva_metrics PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS}) @@ -91,9 +95,6 @@ if(BUILD_TESTING) endif() if(OPENTELEMETRY_INSTALL) - set_target_properties( - opentelemetry_exporter_geneva_metrics - PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_metrics) if(MAIN_PROJECT) install( TARGETS opentelemetry_exporter_geneva_metrics