From 045a9e284f946f306c0de55822e0e0b8a7e79be3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 10 Dec 2024 13:09:47 +1100 Subject: [PATCH] debug --- recipe/meta.yaml | 1 + ...0117-in-StrptimeZoneOffset-for-old-g.patch | 2 +- recipe/patches/0002-disable-gcsfs_test.patch | 2 +- ...3-skip-NonExistentBucket-test-on-osx.patch | 2 +- ...-for-arrow-internal-tracing-Re-Un-wr.patch | 2 +- ...pentelemetry-cpp_SOURCE-to-ignore-AR.patch | 2 +- recipe/patches/0006-debug-otel.patch | 23 +++++++++++++++++++ 7 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 recipe/patches/0006-debug-otel.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index efa35624d..e99bb1c11 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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 diff --git a/recipe/patches/0001-GH-43808-C-skip-0117-in-StrptimeZoneOffset-for-old-g.patch b/recipe/patches/0001-GH-43808-C-skip-0117-in-StrptimeZoneOffset-for-old-g.patch index 80e26bdbe..3155f3f05 100644 --- a/recipe/patches/0001-GH-43808-C-skip-0117-in-StrptimeZoneOffset-for-old-g.patch +++ b/recipe/patches/0001-GH-43808-C-skip-0117-in-StrptimeZoneOffset-for-old-g.patch @@ -1,7 +1,7 @@ From c085cc3f17955415de7b7f7e883b4b3b92737abf Mon Sep 17 00:00:00 2001 From: h-vetinari 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 diff --git a/recipe/patches/0002-disable-gcsfs_test.patch b/recipe/patches/0002-disable-gcsfs_test.patch index b86a0aaf0..c1a731800 100644 --- a/recipe/patches/0002-disable-gcsfs_test.patch +++ b/recipe/patches/0002-disable-gcsfs_test.patch @@ -1,7 +1,7 @@ From b950c9f10abc6381e152e0e9481e00012db53cd4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" 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 diff --git a/recipe/patches/0003-skip-NonExistentBucket-test-on-osx.patch b/recipe/patches/0003-skip-NonExistentBucket-test-on-osx.patch index 414a7bce8..83bf874d1 100644 --- a/recipe/patches/0003-skip-NonExistentBucket-test-on-osx.patch +++ b/recipe/patches/0003-skip-NonExistentBucket-test-on-osx.patch @@ -1,7 +1,7 @@ From 80ea30f7e11c220a66353d661484d5d104e8c295 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" 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 ++++ diff --git a/recipe/patches/0004-set-ARROW_EXPORT-for-arrow-internal-tracing-Re-Un-wr.patch b/recipe/patches/0004-set-ARROW_EXPORT-for-arrow-internal-tracing-Re-Un-wr.patch index 16da55ba7..05fce6ab9 100644 --- a/recipe/patches/0004-set-ARROW_EXPORT-for-arrow-internal-tracing-Re-Un-wr.patch +++ b/recipe/patches/0004-set-ARROW_EXPORT-for-arrow-internal-tracing-Re-Un-wr.patch @@ -1,7 +1,7 @@ From f58974b5b0564399cb23d5fce069a8bf8dda41a5 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" 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 --- diff --git a/recipe/patches/0005-don-t-override-opentelemetry-cpp_SOURCE-to-ignore-AR.patch b/recipe/patches/0005-don-t-override-opentelemetry-cpp_SOURCE-to-ignore-AR.patch index 596796040..0752f1f7a 100644 --- a/recipe/patches/0005-don-t-override-opentelemetry-cpp_SOURCE-to-ignore-AR.patch +++ b/recipe/patches/0005-don-t-override-opentelemetry-cpp_SOURCE-to-ignore-AR.patch @@ -1,7 +1,7 @@ From 051da5daba2bea0c9487b7ebf282a06910360abc Mon Sep 17 00:00:00 2001 From: "H. Vetinari" 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 --- diff --git a/recipe/patches/0006-debug-otel.patch b/recipe/patches/0006-debug-otel.patch new file mode 100644 index 000000000..d0606dd95 --- /dev/null +++ b/recipe/patches/0006-debug-otel.patch @@ -0,0 +1,23 @@ +From 65be11b7a26ff2f3cee249a6252e235145ee5241 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +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