cmake: thrift requires boost headers, include them as Boost_INCLUDE_DIRS #1100

ideepika · 2021-11-25T21:16:48Z

Signed-off-by: Deepika Upadhyay dupadhya@redhat.com

Fixes # (issue)

Changes

Please provide a brief description of the changes here.

For significant contributions please make sure you have completed the following items:

CHANGELOG.md updated for non-trivial changes
Unit tests have been added
Changes in public API reviewed

codecov · 2021-11-25T21:23:10Z

Codecov Report

Merging #1100 (cdb5e63) into main (a320739) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1100   +/-   ##
=======================================
  Coverage   93.29%   93.29%           
=======================================
  Files         174      174           
  Lines        6404     6404           
=======================================
  Hits         5974     5974           
  Misses        430      430

lalitb · 2021-11-29T20:31:26Z

Why do we need to bring FindBoost.cmake? Shouldn't this be coming by default with cmake installation:

$ dpkg -L cmake-data | grep -i boost
/usr/share/cmake-3.16/Help/module/FindBoost.rst
/usr/share/cmake-3.16/Modules/FindBoost.cmake
$

ideepika · 2021-12-01T18:03:26Z

Why do we need to bring FindBoost.cmake? Shouldn't this be coming by default with cmake installation:
$ dpkg -L cmake-data | grep -i boost
/usr/share/cmake-3.16/Help/module/FindBoost.rst
/usr/share/cmake-3.16/Modules/FindBoost.cmake
$

Indeed this should be packaged with cmake, I will test and update the PR soon, thanks for the review!

ideepika · 2021-12-02T08:45:49Z

@lalitb amended, thanks!

lalitb · 2021-12-20T18:57:05Z

CMakeLists.txt

-  if(NOT Thrift_FOUND)
+  if(Thrift_FOUND)
+    find_package(Boost REQUIRED)
+    include_directories(${Boost_INCLUDE_DIRS})


@ideepika - Sorry for replying late on this. Wondering why do we need to explicitly add the Boost headers? Jaeger build is successful in our CI pipeline even without this.

@ideepika - Do you have any updates here ? Thanks.

@lalitb sorry I must have missed the notification, I will check and post update tomorrow, thanks!

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>

ideepika · 2022-01-28T15:05:01Z

In jaeger we had thrift headers which needed boost headers and since we were using external built boost, we needed to define path for Boost Headers in cmake, that should not be an issue when using system installed boost package.
Jenkins tests (in progress) will let us know if the thrift headers for opentelemetry would need the same or not:
ceph/jaeger-client-cpp@7ad60f7 ; will update soon.

esigo · 2022-01-28T16:09:26Z

In jaeger we had thrift headers which needed boost headers and since we were using external built boost, we needed to define path for Boost Headers in cmake, that should not be an issue when using system installed boost package. Jenkins tests (in progress) will let us know if the thrift headers for opentelemetry would need the same or not: ceph/jaeger-client-cpp@7ad60f7 ; will update soon.

@ideepika would it be possible to try setting CPLUS_INCLUDE_PATH to where your boost is and without changes on cmake? Thanks

lalitb · 2022-01-28T19:13:28Z

In jaeger we had thrift headers which needed boost headers and since we were using external built boost, we needed to define path for Boost Headers in cmake, that should not be an issue when using system installed boost package.
Jenkins tests (in progress) will let us know if the thrift headers for opentelemetry would need the same or not:
ceph/jaeger-client-cpp@7ad60f7 ; will update soon.

thanks will wait for the update. I thought boost is only the build-time dependency for thrift, and not included in their API headers. Probably it's not the case.

ideepika · 2022-01-31T11:46:43Z

I did some testing:

when we use self compiled boost library (in case of what we do in @ceph) there is build failure

ged1209ac/src/test/librados_test_stub/TestIoCtxImpl.cc
CMake Error at src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-None.cmake:49 (message):
  Command failed: 2

   'make' 'opentelemetry_trace' 'opentelemetry_exporter_jaeger_trace'

  See also

    /build/ceph-17.0.0-10252-ged1209ac/obj-x86_64-linux-gnu/src/opentelemetry-cpp/src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-*.log


/usr/bin/ranlib ../../../lib/libceph_immutable_object_cache_lib.a
make[4]: *** [src/CMakeFiles/opentelemetry-cpp.dir/build.make:116: src/opentelemetry-cpp/src/opentelemetry-cpp-stamp/opentelemetry-cpp-build] Error 1
make[4]: Leaving directory '/build/ceph-17.0.0-10252-ged1209ac/obj-x86_64-linux-gnu'
make[3]: *** [CMakeFiles/Makefile2:4594: src/CMakeFiles/opentelemetry-cpp.dir/all] Error 2

https://jenkins.ceph.com/job/ceph-dev-new-build/ARCH=x86_64,AVAILABLE_ARCH=x86_64,AVAILABLE_DIST=focal,DIST=focal,MACHINE_SIZE=gigantic/60216//consoleFull

https://shaman.ceph.com/builds/ceph/wip-test-deepika-jaeger/f7c3fcb7357b247541e5e319c7db426cada91ea0/jaeger/293825/
with boost include dirs specified compilation is successful, one thing to note is for opentelemetry CI we install boost-all-dev from package available, that's why I suppose we do face this problem

thrift has boost as their header dependency; when building with self compiled boost, we will end up failing because of missing location for boost headers: /usr/bin/ar qc ../../lib/liblibrados_impl.a CMakeFiles/librados_impl.dir/IoCtxImpl.cc.o CMakeFiles/librados_impl.dir/RadosXattrIter.cc.o CMakeFiles/librados_impl.dir/RadosClient.cc.o CMakeFiles/librados_impl.dir/librados_util.cc.o CMakeFiles/librados_impl.dir/librados_tp.cc.o In file included from /usr/include/thrift/transport/TTransport.h:24, from /usr/include/thrift/protocol/TProtocol.h:28, from /usr/include/thrift/TProcessor.h:24, from /usr/include/thrift/TDispatchProcessor.h:22, from /build/ceph-17.0.0-10478-gd6aaf1fa/src/opentelemetry-cpp/exporters/jaeger/thrift-gen/Agent.h:10, from /build/ceph-17.0.0-10478-gd6aaf1fa/src/opentelemetry-cpp/exporters/jaeger/thrift-gen/Agent.cpp:7: /usr/include/thrift/transport/TTransportException.h:23:10: fatal error: boost/numeric/conversion/cast.hpp: No such file or directory to be more cautious, we use FindBoost.cmake variable Boost_INCLUDE_DIRS specified so that boost installing path is available for opentelemetry to consume. Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>

esigo

Thanks for the PR. LGTM

We were using git fetch and an unofficial remote to fetch opentelemetry-cpp, as it needed additional patch to include boost headers, with the merge of open-telemetry/opentelemetry-cpp#1100 open-telemetry/opentelemetry-cpp#1020 we do not require to maintain our own patched version. This removes compile time fetch for opentelemetry-cpp instead use official opentelemetry-cpp lib as a submodule. Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>

We were using git fetch and an unofficial remote to fetch opentelemetry-cpp, as it needed additional patch to include boost headers, with the merge of open-telemetry/opentelemetry-cpp#1100 open-telemetry/opentelemetry-cpp#1020 we do not require to maintain our own patched version. Also, we were using git fetch as a temporary change, now that tracing is always on, it should be right time to adapt to using opentelemetry-cpp as a submodule. This removes compile time fetch for opentelemetry-cpp instead use official opentelemetry-cpp lib as a submodule. Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>

ideepika requested a review from a team November 25, 2021 21:16

ideepika mentioned this pull request Nov 25, 2021

migrate from using opentracing-cpp to opentelemetry-cpp static as distributed tracing API ceph/ceph#43598

Merged

ideepika force-pushed the wip-ceph branch from 73334fa to 59d2127 Compare December 2, 2021 08:45

lalitb reviewed Dec 20, 2021

View reviewed changes

cmake: add boost as a required package

f1cbe56

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>

ideepika force-pushed the wip-ceph branch from 59d2127 to f1cbe56 Compare January 28, 2022 14:59

Merge branch 'main' into wip-ceph

387a8d1

ideepika force-pushed the wip-ceph branch from 6fc623e to f71c301 Compare February 4, 2022 15:49

lalitb approved these changes Feb 4, 2022

View reviewed changes

Merge branch 'main' into wip-ceph

cdb5e63

esigo approved these changes Feb 4, 2022

View reviewed changes

lalitb merged commit e9127fc into open-telemetry:main Feb 4, 2022

ideepika mentioned this pull request Jun 20, 2022

.gitmodules: add opentelemetry-cpp as a submodule ceph/ceph#46754

Merged

14 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cmake: thrift requires boost headers, include them as Boost_INCLUDE_DIRS #1100

cmake: thrift requires boost headers, include them as Boost_INCLUDE_DIRS #1100

ideepika commented Nov 25, 2021

codecov bot commented Nov 25, 2021 •

edited

Loading

lalitb commented Nov 29, 2021 •

edited

Loading

ideepika commented Dec 1, 2021

ideepika commented Dec 2, 2021

lalitb Dec 20, 2021

lalitb Jan 26, 2022

ideepika Jan 27, 2022

ideepika commented Jan 28, 2022

esigo commented Jan 28, 2022

lalitb commented Jan 28, 2022

ideepika commented Jan 31, 2022

esigo left a comment •

edited

Loading

cmake: thrift requires boost headers, include them as Boost_INCLUDE_DIRS #1100

cmake: thrift requires boost headers, include them as Boost_INCLUDE_DIRS #1100

Conversation

ideepika commented Nov 25, 2021

Changes

codecov bot commented Nov 25, 2021 • edited Loading

Codecov Report

lalitb commented Nov 29, 2021 • edited Loading

ideepika commented Dec 1, 2021

ideepika commented Dec 2, 2021

lalitb Dec 20, 2021

Choose a reason for hiding this comment

lalitb Jan 26, 2022

Choose a reason for hiding this comment

ideepika Jan 27, 2022

Choose a reason for hiding this comment

ideepika commented Jan 28, 2022

esigo commented Jan 28, 2022

lalitb commented Jan 28, 2022

ideepika commented Jan 31, 2022

esigo left a comment • edited Loading

Choose a reason for hiding this comment

codecov bot commented Nov 25, 2021 •

edited

Loading

lalitb commented Nov 29, 2021 •

edited

Loading

esigo left a comment •

edited

Loading