diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 2cb04e6b413..bd635dd169b 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -137,6 +137,7 @@ jobs: ARROW_WITH_BROTLI: ON ARROW_WITH_BZ2: ON ARROW_WITH_LZ4: ON + ARROW_WITH_OPENTELEMETRY: ON ARROW_WITH_SNAPPY: ON ARROW_WITH_ZLIB: ON ARROW_WITH_ZSTD: ON @@ -209,6 +210,7 @@ jobs: ARROW_WITH_BROTLI: OFF ARROW_WITH_BZ2: OFF ARROW_WITH_LZ4: OFF + ARROW_WITH_OPENTELEMETRY: OFF ARROW_WITH_SNAPPY: ON ARROW_WITH_ZLIB: ON ARROW_WITH_ZSTD: ON @@ -274,6 +276,7 @@ jobs: ARROW_WITH_BROTLI: ON ARROW_WITH_BZ2: ON ARROW_WITH_LZ4: ON + ARROW_WITH_OPENTELEMETRY: OFF ARROW_WITH_SNAPPY: ON ARROW_WITH_ZLIB: ON ARROW_WITH_ZSTD: ON diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile index 9363e67f796..c9417da446e 100644 --- a/ci/docker/conda-cpp.dockerfile +++ b/ci/docker/conda-cpp.dockerfile @@ -52,6 +52,8 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_BROTLI=ON \ ARROW_WITH_BZ2=ON \ ARROW_WITH_LZ4=ON \ + # Blocked on https://issues.apache.org/jira/browse/ARROW-15066 + ARROW_WITH_OPENTELEMETRY=OFF \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ diff --git a/ci/docker/debian-10-cpp.dockerfile b/ci/docker/debian-10-cpp.dockerfile index 2bb9e88a711..b5fa2716907 100644 --- a/ci/docker/debian-10-cpp.dockerfile +++ b/ci/docker/debian-10-cpp.dockerfile @@ -89,6 +89,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_BROTLI=ON \ ARROW_WITH_BZ2=ON \ ARROW_WITH_LZ4=ON \ + ARROW_WITH_OPENTELEMETRY=OFF \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ diff --git a/ci/docker/debian-11-cpp.dockerfile b/ci/docker/debian-11-cpp.dockerfile index c2b0e98d9fc..87bb5b50ba5 100644 --- a/ci/docker/debian-11-cpp.dockerfile +++ b/ci/docker/debian-11-cpp.dockerfile @@ -91,6 +91,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_BROTLI=ON \ ARROW_WITH_BZ2=ON \ ARROW_WITH_LZ4=ON \ + ARROW_WITH_OPENTELEMETRY=OFF \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ diff --git a/ci/docker/fedora-33-cpp.dockerfile b/ci/docker/fedora-33-cpp.dockerfile index a60a572ec3a..e42f7428f17 100644 --- a/ci/docker/fedora-33-cpp.dockerfile +++ b/ci/docker/fedora-33-cpp.dockerfile @@ -83,6 +83,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_BROTLI=ON \ ARROW_WITH_BZ2=ON \ ARROW_WITH_LZ4=ON \ + ARROW_WITH_OPENTELEMETRY=ON \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ diff --git a/ci/docker/ubuntu-18.04-cpp.dockerfile b/ci/docker/ubuntu-18.04-cpp.dockerfile index d3023f33794..ed038f4c4c5 100644 --- a/ci/docker/ubuntu-18.04-cpp.dockerfile +++ b/ci/docker/ubuntu-18.04-cpp.dockerfile @@ -117,6 +117,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_BROTLI=ON \ ARROW_WITH_BZ2=ON \ ARROW_WITH_LZ4=ON \ + ARROW_WITH_OPENTELEMETRY=OFF \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ diff --git a/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile b/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile index e551754ee2f..f77ff40e5fb 100644 --- a/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile +++ b/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile @@ -87,6 +87,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_BROTLI=ON \ ARROW_WITH_BZ2=ON \ ARROW_WITH_LZ4=ON \ + ARROW_WITH_OPENTELEMETRY=OFF \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile index 842be8ddbde..6d06f5c309c 100644 --- a/ci/docker/ubuntu-20.04-cpp.dockerfile +++ b/ci/docker/ubuntu-20.04-cpp.dockerfile @@ -141,6 +141,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_BROTLI=ON \ ARROW_WITH_BZ2=ON \ ARROW_WITH_LZ4=ON \ + ARROW_WITH_OPENTELEMETRY=ON \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ diff --git a/ci/docker/ubuntu-21.04-cpp.dockerfile b/ci/docker/ubuntu-21.04-cpp.dockerfile index 2f74e177d32..88efdd51303 100644 --- a/ci/docker/ubuntu-21.04-cpp.dockerfile +++ b/ci/docker/ubuntu-21.04-cpp.dockerfile @@ -136,6 +136,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_BROTLI=ON \ ARROW_WITH_BZ2=ON \ ARROW_WITH_LZ4=ON \ + ARROW_WITH_OPENTELEMETRY=ON \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh index a40e407c3a5..4bbfcb7f90b 100755 --- a/ci/scripts/cpp_build.sh +++ b/ci/scripts/cpp_build.sh @@ -122,6 +122,7 @@ cmake \ -DARROW_WITH_BROTLI=${ARROW_WITH_BROTLI:-OFF} \ -DARROW_WITH_BZ2=${ARROW_WITH_BZ2:-OFF} \ -DARROW_WITH_LZ4=${ARROW_WITH_LZ4:-OFF} \ + -DARROW_WITH_OPENTELEMETRY=${ARROW_WITH_OPENTELEMETRY:-OFF} \ -DARROW_WITH_SNAPPY=${ARROW_WITH_SNAPPY:-OFF} \ -DARROW_WITH_UTF8PROC=${ARROW_WITH_UTF8PROC:-ON} \ -DARROW_WITH_ZLIB=${ARROW_WITH_ZLIB:-OFF} \ diff --git a/cpp/src/arrow/compute/exec/aggregate_node.cc b/cpp/src/arrow/compute/exec/aggregate_node.cc index 924b3a1315c..b4982ef111f 100644 --- a/cpp/src/arrow/compute/exec/aggregate_node.cc +++ b/cpp/src/arrow/compute/exec/aggregate_node.cc @@ -252,7 +252,7 @@ class ScalarAggregateNode : public ExecNode { Future<> finished() override { return finished_; } protected: - std::string ToStringExtra(int indent) const override { + std::string ToStringExtra(int indent = 0) const override { std::stringstream ss; const auto input_schema = inputs_[0]->output_schema(); AggregatesToString(&ss, *input_schema, aggs_, target_field_ids_, owned_options_); @@ -618,7 +618,7 @@ class GroupByNode : public ExecNode { Future<> finished() override { return finished_; } protected: - std::string ToStringExtra(int indent) const override { + std::string ToStringExtra(int indent = 0) const override { std::stringstream ss; const auto input_schema = inputs_[0]->output_schema(); ss << "keys=["; diff --git a/cpp/src/arrow/compute/exec/filter_node.cc b/cpp/src/arrow/compute/exec/filter_node.cc index 961108432a0..6f15e44653f 100644 --- a/cpp/src/arrow/compute/exec/filter_node.cc +++ b/cpp/src/arrow/compute/exec/filter_node.cc @@ -116,7 +116,7 @@ class FilterNode : public MapNode { } protected: - std::string ToStringExtra(int indent) const override { + std::string ToStringExtra(int indent = 0) const override { return "filter=" + filter_.ToString(); } diff --git a/cpp/src/arrow/compute/exec/project_node.cc b/cpp/src/arrow/compute/exec/project_node.cc index ae276e17ce8..79eddeb15e2 100644 --- a/cpp/src/arrow/compute/exec/project_node.cc +++ b/cpp/src/arrow/compute/exec/project_node.cc @@ -111,7 +111,7 @@ class ProjectNode : public MapNode { } protected: - std::string ToStringExtra(int indent) const override { + std::string ToStringExtra(int indent = 0) const override { std::stringstream ss; ss << "projection=["; for (int i = 0; static_cast(i) < exprs_.size(); i++) { diff --git a/cpp/src/arrow/compute/exec/sink_node.cc b/cpp/src/arrow/compute/exec/sink_node.cc index 51316d6303e..a59d5eaed41 100644 --- a/cpp/src/arrow/compute/exec/sink_node.cc +++ b/cpp/src/arrow/compute/exec/sink_node.cc @@ -350,7 +350,7 @@ struct OrderBySinkNode final : public SinkNode { } protected: - std::string ToStringExtra(int indent) const override { + std::string ToStringExtra(int indent = 0) const override { return std::string("by=") + impl_->ToString(); }