Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
294 changes: 121 additions & 173 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion cpp/src/arrow/ArrowConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,15 @@ macro(arrow_find_dependencies dependencies)
endif()
endif()
endif()
find_dependency(${dependency})
if(${dependency} STREQUAL "opentelemetry-cpp")
find_dependency(${dependency}
COMPONENTS
exporters_ostream
exporters_otlp_http
sdk)
else()
find_dependency(${dependency})
endif()
if(ARROW_OPENSSL_HOMEBREW_MAKE_DETECTABLE)
set(OPENSSL_ROOT_DIR ${ARROW_OPENSSL_ROOT_DIR_ORIGINAL})
endif()
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ if(ARROW_S3)
endif()

if(ARROW_WITH_OPENTELEMETRY)
if(opentelemetry_SOURCE STREQUAL "SYSTEM")
if(opentelemetry-cpp_SOURCE STREQUAL "SYSTEM")
list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS ${ARROW_OPENTELEMETRY_LIBS})
endif()
list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS CURL::libcurl)
Expand Down
4 changes: 2 additions & 2 deletions dev/release/verify-yum.sh
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,10 @@ if [ "${cmake_version_major}" -gt "3" ] || \
[ "${cmake_version_major}" -eq "3" -a "${cmake_version_minor}" -ge "25" ]; then
cp -a "${TOP_SOURCE_DIR}/cpp/examples/minimal_build" build/
pushd build/minimal_build
cmake -S . -B build_shared
cmake -S . -B build_shared -DCMAKE_VERBOSE_MAKEFILE=ON
make -C build_shared -j$(nproc)
build_shared/arrow-example
cmake -S . -B build_static -DARROW_LINK_SHARED=OFF
cmake -S . -B build_static -DARROW_LINK_SHARED=OFF -DCMAKE_VERBOSE_MAKEFILE=ON
make -C build_static -j$(nproc)
build_static/arrow-example
mkdir -p build_pkg_config
Expand Down
20 changes: 20 additions & 0 deletions dev/tasks/linux-packages/apache-arrow/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,29 @@ class ApacheArrowPackageTask < PackageTask
control.gsub(/@CUDA_ARCHITECTURE@/, cuda_architecture)
end

def apt_prepare_debian_control_open_telemetry(control, target)
case target
when /\Aubuntu-(?:jammy|noble)/
use_system_open_telemetry = "#"
system_open_telemetry_require_grpc = "#"
else
use_system_open_telemetry = ""
if target.start_with?("debian-trixie")
system_open_telemetry_require_grpc = ""
else
system_open_telemetry_require_grpc = "#"
end
end
control
.gsub(/@USE_SYSTEM_OPEN_TELEMETRY@/, use_system_open_telemetry)
.gsub(/@SYSTEM_OPEN_TELEMETRY_REQUIRE_GRPC@/,
system_open_telemetry_require_grpc)
end

def apt_prepare_debian_control(control_in, target)
control = control_in.dup
control = apt_prepare_debian_control_cuda_architecture(control, target)
control = apt_prepare_debian_control_open_telemetry(control, target)
control
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ RUN \
libgtest-dev \
liblz4-dev \
libmimalloc-dev \
libopentelemetry-proto-dev \
libprotobuf-dev \
libprotoc-dev \
libre2-dev \
Expand All @@ -74,6 +75,7 @@ RUN \
meson \
ninja-build \
nlohmann-json3-dev \
opentelemetry-cpp-dev \
pkg-config \
protobuf-compiler-grpc \
python3-dev \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ RUN \
libgtest-dev \
liblz4-dev \
libmimalloc-dev \
libopentelemetry-proto-dev \
libprotobuf-dev \
libprotoc-dev \
libre2-dev \
Expand All @@ -74,6 +75,7 @@ RUN \
meson \
ninja-build \
nlohmann-json3-dev \
opentelemetry-cpp-dev \
pkg-config \
protobuf-compiler-grpc \
python3-dev \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ RUN \
libgrpc++-dev \
libgtest-dev \
liblz4-dev \
libopentelemetry-proto-dev \
libprotobuf-dev \
libprotoc-dev \
libre2-dev \
Expand All @@ -68,6 +69,7 @@ RUN \
mold \
ninja-build \
nlohmann-json3-dev \
opentelemetry-cpp-dev \
pkg-config \
protobuf-compiler-grpc \
python3-dev \
Expand Down
4 changes: 4 additions & 0 deletions dev/tasks/linux-packages/apache-arrow/debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Build-Depends:
libgrpc++-dev,
libgtest-dev,
liblz4-dev,
@USE_SYSTEM_OPEN_TELEMETRY@ libopentelemetry-proto-dev,
libprotobuf-dev,
libprotoc-dev,
libre2-dev,
Expand All @@ -35,6 +36,7 @@ Build-Depends:
# in the debian-forky Dockerfile) skips this build dependency and the CUDA
# packages below.
nvidia-cuda-toolkit [!arm64] <!pkg.apache-arrow.nocuda>,
@USE_SYSTEM_OPEN_TELEMETRY@ opentelemetry-cpp-dev,
pkg-config,
protobuf-compiler,
protobuf-compiler-grpc,
Expand Down Expand Up @@ -162,6 +164,7 @@ Depends:
libbz2-dev,
libc-ares-dev,
libcurl4-openssl-dev,
@SYSTEM_OPEN_TELEMETRY_REQUIRE_GRPC@ libgrpc++-dev,
liblz4-dev,
libprotobuf-dev,
libprotoc-dev,
Expand All @@ -172,6 +175,7 @@ Depends:
libxxhash-dev,
libzstd-dev,
nlohmann-json-dev | nlohmann-json3-dev,
@USE_SYSTEM_OPEN_TELEMETRY@ opentelemetry-cpp-dev,
protobuf-compiler-grpc,
zlib1g-dev
Description: Apache Arrow is a data processing library for analysis
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ override_dh_auto_configure:
-DARROW_WITH_BROTLI=ON \
-DARROW_WITH_BZ2=ON \
-DARROW_WITH_LZ4=ON \
-DARROW_WITH_OPENTELEMETRY=ON \
-DARROW_WITH_SNAPPY=ON \
-DARROW_WITH_ZLIB=ON \
-DARROW_WITH_ZSTD=ON \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ cd cpp
-DARROW_WITH_BROTLI=ON \
-DARROW_WITH_BZ2=ON \
-DARROW_WITH_LZ4=ON \
-DARROW_WITH_OPENTELEMETRY=ON \
-DARROW_WITH_SNAPPY=ON \
-DARROW_WITH_ZLIB=ON \
-DARROW_WITH_ZSTD=ON \
Expand Down
Loading