Skip to content

ARROW-15027: [C++] Fix OpenTelemetry CMake definitions #11903

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

Closed
lidavidm wants to merge 1 commit into from
Closed

ARROW-15027: [C++] Fix OpenTelemetry CMake definitions #11903

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
12 changes: 11 additions & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3918,6 +3918,7 @@ macro(build_opentelemetry)
common
http_client_curl
ostream_span_exporter
otlp_http_client
otlp_http_exporter
otlp_recordable
proto
Expand All @@ -3934,6 +3935,7 @@ macro(build_opentelemetry)
"${OPENTELEMETRY_INCLUDE_DIR}")
endforeach()
foreach(_OPENTELEMETRY_LIB ${_OPENTELEMETRY_LIBS})
# N.B. OTel targets and libraries don't follow any consistent naming scheme
if(_OPENTELEMETRY_LIB STREQUAL "http_client_curl")
set(_OPENTELEMETRY_STATIC_LIBRARY
"${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${_OPENTELEMETRY_LIB}${CMAKE_STATIC_LIBRARY_SUFFIX}"
Expand All @@ -3942,6 +3944,10 @@ macro(build_opentelemetry)
set(_OPENTELEMETRY_STATIC_LIBRARY
"${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_ostream_span${CMAKE_STATIC_LIBRARY_SUFFIX}"
)
elseif(_OPENTELEMETRY_LIB STREQUAL "otlp_http_client")
set(_OPENTELEMETRY_STATIC_LIBRARY
"${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_http_client${CMAKE_STATIC_LIBRARY_SUFFIX}"
)
elseif(_OPENTELEMETRY_LIB STREQUAL "otlp_http_exporter")
set(_OPENTELEMETRY_STATIC_LIBRARY
"${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_http${CMAKE_STATIC_LIBRARY_SUFFIX}"
Expand Down Expand Up @@ -4082,9 +4088,13 @@ macro(build_opentelemetry)
PROPERTIES INTERFACE_LINK_LIBRARIES
"opentelemetry-cpp::trace;opentelemetry-cpp::resources;opentelemetry-cpp::proto"
)
set_target_properties(opentelemetry-cpp::otlp_http_client
PROPERTIES INTERFACE_LINK_LIBRARIES
"opentelemetry-cpp::sdk;opentelemetry-cpp::proto;opentelemetry-cpp::http_client_curl;nlohmann_json::nlohmann_json"
)
set_target_properties(opentelemetry-cpp::otlp_http_exporter
PROPERTIES INTERFACE_LINK_LIBRARIES
"opentelemetry-cpp::otlp_recordable;opentelemetry-cpp::http_client_curl;nlohmann_json::nlohmann_json"
"opentelemetry-cpp::otlp_recordable;opentelemetry-cpp::otlp_http_client"
)

foreach(_OPENTELEMETRY_LIB ${_OPENTELEMETRY_LIBS})
Expand Down