raulcd commented on code in PR #48556:
URL: https://github.com/apache/arrow/pull/48556#discussion_r2667747292
##########
cpp/cmake_modules/ThirdpartyToolchain.cmake:
##########
@@ -3726,220 +3689,87 @@ endif()
# ----------------------------------------------------------------------
# OpenTelemetry C++
-macro(build_opentelemetry)
- message(STATUS "Building OpenTelemetry from source")
+function(build_opentelemetry)
+ list(APPEND CMAKE_MESSAGE_INDENT "OpenTelemetry: ")
+ message(STATUS "Building OpenTelemetry from source using FetchContent")
+
if(Protobuf_VERSION VERSION_GREATER_EQUAL 3.22)
message(FATAL_ERROR "GH-36013: Can't use bundled OpenTelemetry with
Protobuf 3.22 or later. "
"Protobuf is version ${Protobuf_VERSION}")
endif()
- set(OPENTELEMETRY_PREFIX
"${CMAKE_CURRENT_BINARY_DIR}/opentelemetry_ep-install")
- set(OPENTELEMETRY_INCLUDE_DIR "${OPENTELEMETRY_PREFIX}/include")
- set(OPENTELEMETRY_STATIC_LIB
-
"${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ set(OPENTELEMETRY_VENDORED
+ TRUE
+ PARENT_SCOPE)
+
+ fetchcontent_declare(opentelemetry_proto
+ ${FC_DECLARE_COMMON_OPTIONS}
+ URL ${OPENTELEMETRY_PROTO_SOURCE_URL}
+ URL_HASH
"SHA256=${ARROW_OPENTELEMETRY_PROTO_BUILD_SHA256_CHECKSUM}"
)
- set(_OPENTELEMETRY_APIS api ext sdk)
- set(_OPENTELEMETRY_LIBS
- common
- http_client_curl
- logs
- ostream_log_record_exporter
- ostream_span_exporter
- otlp_http_client
- otlp_http_log_record_exporter
- otlp_http_exporter
- otlp_recordable
- proto
- resources
- trace
- version)
- set(OPENTELEMETRY_BUILD_BYPRODUCTS)
- set(OPENTELEMETRY_LIBRARIES)
-
- foreach(_OPENTELEMETRY_LIB ${_OPENTELEMETRY_APIS})
- add_library(opentelemetry-cpp::${_OPENTELEMETRY_LIB} INTERFACE IMPORTED)
- target_include_directories(opentelemetry-cpp::${_OPENTELEMETRY_LIB} BEFORE
- INTERFACE "${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_${_OPENTELEMETRY_LIB}${CMAKE_STATIC_LIBRARY_SUFFIX}"
- )
- elseif(_OPENTELEMETRY_LIB STREQUAL "ostream_span_exporter")
- 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}"
- )
- elseif(_OPENTELEMETRY_LIB STREQUAL "otlp_http_log_record_exporter")
- set(_OPENTELEMETRY_STATIC_LIBRARY
-
"${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_http_log${CMAKE_STATIC_LIBRARY_SUFFIX}"
- )
- elseif(_OPENTELEMETRY_LIB STREQUAL "ostream_log_record_exporter")
- set(_OPENTELEMETRY_STATIC_LIBRARY
-
"${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_ostream_logs${CMAKE_STATIC_LIBRARY_SUFFIX}"
- )
- else()
- set(_OPENTELEMETRY_STATIC_LIBRARY
-
"${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_${_OPENTELEMETRY_LIB}${CMAKE_STATIC_LIBRARY_SUFFIX}"
- )
- endif()
- add_library(opentelemetry-cpp::${_OPENTELEMETRY_LIB} STATIC IMPORTED)
- set_target_properties(opentelemetry-cpp::${_OPENTELEMETRY_LIB}
- PROPERTIES IMPORTED_LOCATION
${_OPENTELEMETRY_STATIC_LIBRARY})
- list(APPEND OPENTELEMETRY_BUILD_BYPRODUCTS
${_OPENTELEMETRY_STATIC_LIBRARY})
- list(APPEND OPENTELEMETRY_LIBRARIES
opentelemetry-cpp::${_OPENTELEMETRY_LIB})
- endforeach()
- set(OPENTELEMETRY_CMAKE_ARGS
- ${EP_COMMON_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX=${OPENTELEMETRY_PREFIX}"
Review Comment:
Thanks for the assessment, I love that I always make the `protobug` typo,
seems I'm not the only one :P
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
