You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2023/06/16 00:31:33 UTC
[arrow] branch main updated: GH-36013: [C++] Disabling bundled OpenTelemetry with Protobuf 3.22+ (#36016)
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 41309de8dd GH-36013: [C++] Disabling bundled OpenTelemetry with Protobuf 3.22+ (#36016)
41309de8dd is described below
commit 41309de8dd91a9821873fc5f94339f0542ca0108
Author: Benjamin Kietzman <be...@gmail.com>
AuthorDate: Thu Jun 15 20:31:27 2023 -0400
GH-36013: [C++] Disabling bundled OpenTelemetry with Protobuf 3.22+ (#36016)
OpenTelemetry and Protobuf 3.22+ have conflicting versions of Abseil, which is causing build errors. This patch disables OpenTelemetry on macOS because Homebrew provides Protobuf 3.22+.
* Closes: #36013
Authored-by: Benjamin Kietzman <be...@gmail.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
.github/workflows/cpp.yml | 4 +++-
cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 28cb16f354..7f0ed16fdd 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -162,7 +162,9 @@ jobs:
ARROW_WITH_BROTLI: ON
ARROW_WITH_BZ2: ON
ARROW_WITH_LZ4: ON
- ARROW_WITH_OPENTELEMETRY: ON
+ # GH-36013 disabling opentelemetry here because we can't
+ # get the patched version from conda
+ # ARROW_WITH_OPENTELEMETRY: ON
ARROW_WITH_SNAPPY: ON
ARROW_WITH_ZLIB: ON
ARROW_WITH_ZSTD: ON
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 9e8ecb5ceb..68d5be8ba4 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -4511,6 +4511,10 @@ endif()
macro(build_opentelemetry)
message(STATUS "Building OpenTelemetry from source")
+ 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")