Skip to content
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.

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

jaegertracing build/ops integration #31358

Merged
merged 7 commits into from Dec 16, 2020

Conversation

ideepika
Copy link
Member

@ideepika ideepika commented Nov 4, 2019

Milestones

  • Build Jaeger as External Project ( all cmake at scalable level)
  • OSD trace using marker spans
  • Off the wire context transfer configuration
  • Documentation
  • RGW path trace
  • Use Case Documentation
  • Reviews, Cleanups and Documentation update
  • Code Coverage and Tests

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

Show available Jenkins commands
  • jenkins retest this please
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@neha-ojha neha-ojha changed the title Wip jaegertracing in ceph [WIP] jaegertracing in ceph Nov 5, 2019
CMakeLists.txt Outdated Show resolved Hide resolved
cmake/modules/FindYAMLCPP.cmake Outdated Show resolved Hide resolved
cmake/modules/FindJAEGER.cmake Outdated Show resolved Hide resolved
cmake/modules/FindOPENTRACE.cmake Outdated Show resolved Hide resolved
cmake/modules/FindOPENTRACE.cmake Outdated Show resolved Hide resolved
@ideepika ideepika force-pushed the wip-jaegertracing-in-ceph branch 2 times, most recently from 6c16bdd to 958e4c4 Compare December 16, 2019 12:52
@ideepika ideepika force-pushed the wip-jaegertracing-in-ceph branch 3 times, most recently from 5f4ac82 to d6632b0 Compare January 7, 2020 10:34
@stale
Copy link

stale bot commented Mar 14, 2020

This pull request has been automatically marked as stale because it has not had any activity for 60 days. It will be closed if no further activity occurs for another 30 days.
If you are a maintainer or core committer, please follow-up on this pull request to identify what steps should be taken by the author to move this proposed change forward.
If you are the author of this pull request, thank you for your proposed contribution. If you believe this change is still appropriate, please ensure that any feedback has been addressed and ask for a code review.

@stale stale bot added the stale label Mar 14, 2020
@ideepika ideepika removed the stale label Mar 16, 2020
@ideepika ideepika force-pushed the wip-jaegertracing-in-ceph branch 2 times, most recently from 1344ed7 to b01f984 Compare March 17, 2020 14:29
@ideepika ideepika force-pushed the wip-jaegertracing-in-ceph branch 2 times, most recently from 25dc32c to 5c324b4 Compare April 21, 2020 10:27
@stale stale bot added the stale label Jul 11, 2020
@ideepika ideepika removed the stale label Jul 11, 2020
@ceph ceph deleted a comment from stale bot Jul 11, 2020
@ideepika ideepika force-pushed the wip-jaegertracing-in-ceph branch 2 times, most recently from 37764d5 to 151a60a Compare July 14, 2020 10:53
@ideepika ideepika requested a review from a team as a code owner July 14, 2020 10:53
@ideepika ideepika force-pushed the wip-jaegertracing-in-ceph branch 3 times, most recently from 5b41797 to 440f7aa Compare December 10, 2020 14:48
Copy link
Member

@jdurgin jdurgin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good in general, a few minor things noted

ceph.spec.in Show resolved Hide resolved
ceph.spec.in Show resolved Hide resolved
src/common/tracer.cc Outdated Show resolved Hide resolved
if(!tracer){
YAML::Node yaml;
try{
yaml = YAML::LoadFile("../src/jaegertracing/config.yml");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should probably be a config option. in the future it'd be very useful to be able to change the jaeger config at runtime as well, not sure how the opentracing library handles that

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noted.

src/osd/PrimaryLogPG.cc Outdated Show resolved Hide resolved
src/osd/OSD.cc Outdated Show resolved Hide resolved
src/osd/OpRequest.h Show resolved Hide resolved
src/osd/OpRequest.h Outdated Show resolved Hide resolved
src/osd/OSD.cc Outdated Show resolved Hide resolved
src/vstart.sh Outdated Show resolved Hide resolved
Deepika Upadhyay added 6 commits December 11, 2020 07:55
* This commit introduces Jaegertracing library as package libjaeger,
  pickwhich would be consumed by other ceph pacakges such as ceph-common0

* adds the following dependencies, which would be build from source
  using ExternalProjectHelper.cmake +IncludeJaeger.cmake +
  Build<package>.cmake scripts:

  jaegertracing: v0.6.0 [added as a submodule]
  opentracing: v1.6.0 [added as a submodule]
  thrift: 0.13.0 [added as a submodule]
  yaml-cpp: 0.6.0
  json(optional)

* updates Boost to be installed instead of being build only, because
  jaegertracing them during their build process.

* ceph.spec.in: introduces a default enabled jaeger packaging option,
  which could be disabled using --without-jaeger flag during rpmbuild

* note: libjaeger package if enabled will be a dependency on ceph-common, ceph-mon, rgw_common and transitively will be a dependency for modules that have them as  a dependency.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
* add tracing header files { common/tracer.{h/cc} }

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
@ideepika
Copy link
Member Author

@@ -364,6 +364,11 @@ if(WITH_BLKIN)
include_directories(SYSTEM src/blkin/blkin-lib)
endif(WITH_BLKIN)

option(WITH_JAEGER "Enable jaegertracing and it's dependent libraries" OFF)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its

@@ -0,0 +1,65 @@
# This module builds Jaeger after it's dependencies are installed and discovered
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its

src/vstart.sh Outdated Show resolved Hide resolved
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Copy link
Member

@jdurgin jdurgin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! let's merge this and handle follow-on work in further PRs.

@jdurgin jdurgin merged commit 8a74a93 into ceph:master Dec 16, 2020
@tchaikov
Copy link
Contributor

@ideepika @jdurgin this change breaks the build

-- Checking for one of the modules 'yaml-cpp'
CMake Error at /usr/share/cmake-3.10/Modules/FindPackageHandleStandardArgs.cmake:137 (message):
  Could NOT find yaml-cpp: Found unsuitable version "", but required is at
  least "0.5.1" (found yaml-cpp_LIBRARY-NOTFOUND)
Call Stack (most recent call first):
  /usr/share/cmake-3.10/Modules/FindPackageHandleStandardArgs.cmake:376 (_FPHSA_FAILURE_MESSAGE)
  cmake/modules/Findyaml-cpp.cmake:46 (find_package_handle_standard_args)
  src/CMakeLists.txt:331 (_find_package)
  src/seastar/cmake/SeastarDependencies.cmake:98 (find_package)
  src/seastar/CMakeLists.txt:330 (seastar_find_dependencies)


-- Configuring incomplete, errors occurred!
See also "/home/jenkins-build/build/workspace/ceph-pull-requests/build/CMakeFiles/CMakeOutput.log".
See also "/home/jenkins-build/build/workspace/ceph-pull-requests/build/CMakeFiles/CMakeError.log".
+ exit 1

@tchaikov
Copy link
Contributor

@ideepika
could you prefix the title of your commit message with the subcomponent your are changing ? see https://github.com/ceph/ceph/blob/master/SubmittingPatches.rst#3-describe-your-changes

we don't have a component named "core" or "jaeger". would you please be more specific in future?

@ideepika
Copy link
Member Author

@ideepika @jdurgin this change breaks the build

-- Checking for one of the modules 'yaml-cpp'
CMake Error at /usr/share/cmake-3.10/Modules/FindPackageHandleStandardArgs.cmake:137 (message):
  Could NOT find yaml-cpp: Found unsuitable version "", but required is at
  least "0.5.1" (found yaml-cpp_LIBRARY-NOTFOUND)
Call Stack (most recent call first):
  /usr/share/cmake-3.10/Modules/FindPackageHandleStandardArgs.cmake:376 (_FPHSA_FAILURE_MESSAGE)
  cmake/modules/Findyaml-cpp.cmake:46 (find_package_handle_standard_args)
  src/CMakeLists.txt:331 (_find_package)
  src/seastar/cmake/SeastarDependencies.cmake:98 (find_package)
  src/seastar/CMakeLists.txt:330 (seastar_find_dependencies)


-- Configuring incomplete, errors occurred!
See also "/home/jenkins-build/build/workspace/ceph-pull-requests/build/CMakeFiles/CMakeOutput.log".
See also "/home/jenkins-build/build/workspace/ceph-pull-requests/build/CMakeFiles/CMakeError.log".
+ exit 1

@tchaikov seems like missed to catch it, i will fix it asap, thanks!

@ideepika
Copy link
Member Author

@ideepika
could you prefix the title of your commit message with the subcomponent your are changing ? see https://github.com/ceph/ceph/blob/master/SubmittingPatches.rst#3-describe-your-changes

we don't have a component named "core" or "jaeger". would you please be more specific in future?

thanks, will keep in mind!

@tchaikov
Copy link
Contributor

FTBFS addressed by #38609

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants