Skip to content

Commit

Permalink
debug
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Dec 10, 2024
1 parent d2cc92a commit 045a9e2
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 5 deletions.
1 change: 1 addition & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ source:
- patches/0003-skip-NonExistentBucket-test-on-osx.patch
- patches/0004-set-ARROW_EXPORT-for-arrow-internal-tracing-Re-Un-wr.patch
- patches/0005-don-t-override-opentelemetry-cpp_SOURCE-to-ignore-AR.patch
- patches/0006-debug-otel.patch
# testing-submodules not part of release tarball
- git_url: https://github.com/apache/arrow-testing.git
git_rev: 4d209492d514c2d3cb2d392681b9aa00e6d8da1c
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c085cc3f17955415de7b7f7e883b4b3b92737abf Mon Sep 17 00:00:00 2001
From: h-vetinari <[email protected]>
Date: Fri, 15 Nov 2024 19:38:40 +1100
Subject: [PATCH 1/5] GH-43808: [C++] skip `-0117` in StrptimeZoneOffset for
Subject: [PATCH 1/6] GH-43808: [C++] skip `-0117` in StrptimeZoneOffset for
old glibc (#44621)

### Rationale for this change
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0002-disable-gcsfs_test.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b950c9f10abc6381e152e0e9481e00012db53cd4 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Sat, 2 Nov 2024 15:41:34 +1100
Subject: [PATCH 2/5] disable gcsfs_test
Subject: [PATCH 2/6] disable gcsfs_test

it cannot work unless we package https://github.com/googleapis/storage-testbench,
which however has extremely tight dependencies on protobuf etc., making it very
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 80ea30f7e11c220a66353d661484d5d104e8c295 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Sun, 24 Nov 2024 20:22:35 +1100
Subject: [PATCH 3/5] skip NonExistentBucket test on osx
Subject: [PATCH 3/6] skip NonExistentBucket test on osx

---
cpp/src/arrow/filesystem/s3fs_test.cc | 4 ++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f58974b5b0564399cb23d5fce069a8bf8dda41a5 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Sat, 13 May 2023 11:13:51 +1100
Subject: [PATCH 4/5] set ARROW_EXPORT for
Subject: [PATCH 4/6] set ARROW_EXPORT for
arrow::internal::tracing::{Re,Un}wrapSpan

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 051da5daba2bea0c9487b7ebf282a06910360abc Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Fri, 1 Dec 2023 13:53:57 +1100
Subject: [PATCH 5/5] don't override opentelemetry-cpp_SOURCE to ignore
Subject: [PATCH 5/6] don't override opentelemetry-cpp_SOURCE to ignore
ARROW_DEPENDENCY_SOURCE=SYSTEM

---
Expand Down
23 changes: 23 additions & 0 deletions recipe/patches/0006-debug-otel.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 65be11b7a26ff2f3cee249a6252e235145ee5241 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Tue, 10 Dec 2024 13:08:48 +1100
Subject: [PATCH 6/6] debug otel

---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 2 ++
1 file changed, 2 insertions(+)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 762e30814..6ad0ab069 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -4966,7 +4966,9 @@ if(ARROW_WITH_OPENTELEMETRY)
# cURL is required whether we build from source or use an existing installation
# (OTel's cmake files do not call find_curl for you)
find_curl()
+ set(CMAKE_FIND_DEBUG_MODE TRUE)
resolve_dependency(opentelemetry-cpp)
+ set(CMAKE_FIND_DEBUG_MODE FALSE)
set(ARROW_OPENTELEMETRY_LIBS
opentelemetry-cpp::trace
opentelemetry-cpp::logs

0 comments on commit 045a9e2

Please sign in to comment.