Skip to content

[Geneva] Make EXPORT_NAME consistent #553

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
merged 3 commits into from
Jun 10, 2025
Merged

[Geneva] Make EXPORT_NAME consistent #553

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a074f5
[Geneva] Make EXPORT_NAME consistent
ThomsonTan Jun 10, 2025
db8ee8f
Fix typo
ThomsonTan Jun 10, 2025
04e5fe5
Address feedback
ThomsonTan Jun 10, 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
16 changes: 8 additions & 8 deletions exporters/fluentd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,14 @@ if (WITH_EXAMPLES)
endif()

if(OPENTELEMETRY_INSTALL)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The export name properties are good to set unconditionally. These lines can go immediately after add_library calls for each target.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved it out to be after add_libary().

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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions exporters/geneva-trace/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
Expand All @@ -60,7 +60,7 @@ if(OPENTELEMETRY_INSTALL)
FILES_DIRECTORY
"include/opentelemetry/exporters/geneva"
FILES_DESTINATION
"include/opentelemetry/exporters/geneva"
"include/opentelemetry/exporters"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The destination path should not include "geneva".

FILES_MATCHING
PATTERN
"*.h")
Expand Down
62 changes: 29 additions & 33 deletions exporters/geneva/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_target_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)
Expand Down
42 changes: 21 additions & 21 deletions exporters/user_events/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down