Skip to content

ARROW-15533: [C++] Check ARROW_WITH_OPENTELEMETRY in CI #12322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mbrobbel wants to merge 7 commits into from
Closed

ARROW-15533: [C++] Check ARROW_WITH_OPENTELEMETRY in CI #12322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
62e9bf0
Build Arrow with OpenTelemetry in C++ workflow
mbrobbel Feb 2, 2022
cf90cae
Add default value for ExecNode::ToStringExtra indent argument
mbrobbel Feb 2, 2022
6915ecd
Add ARROW_WITH_OPENTELEMETRY to C++ build script and Dockerfiles
mbrobbel Feb 2, 2022
ad470f6
Disable OpenTelemetry in conda build. Blocked on ARROW-15066.
mbrobbel Feb 3, 2022
0917b64
Disable OpenTelemetry in Windows builds
mbrobbel Feb 3, 2022
02edcb8
Enable OpenTelemetry in more builds
pitrou Feb 3, 2022
105b3c0
Disable on Ubuntu 18.04 (OpenTelemetry build failure)
pitrou Feb 3, 2022
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
3 changes: 3 additions & 0 deletions .github/workflows/cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions ci/docker/conda-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ci/docker/debian-10-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ci/docker/debian-11-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ci/docker/fedora-33-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ci/docker/ubuntu-18.04-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ci/docker/ubuntu-20.04-cpp-minimal.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ci/docker/ubuntu-20.04-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ci/docker/ubuntu-21.04-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ci/scripts/cpp_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/compute/exec/aggregate_node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_);
Expand Down Expand Up @@ -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=[";
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/compute/exec/filter_node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/compute/exec/project_node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<size_t>(i) < exprs_.size(); i++) {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/compute/exec/sink_node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down