Merge pull request #31358 from ideepika/wip-jaegertracing-in-ceph

jaegertracing build/ops integration

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc CMakeLists.txt
Simple merge

diff --cc ceph.spec.in
Simple merge

diff --cc debian/control
index 4a89172aff9eb85e131a6d5ad0c3c575ac3c5771,50e2f665adfb356e1877f1eaa5b1688ae0b11ecc..e894e5028f249f306a1be15a42c65a46e7742fc5
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -33,8 -35,8 +36,9 @@@ Build-Depends: automake
                 libcap-ng-dev,
                 libcunit1-dev,
                 libcurl4-openssl-dev,
+                libevent-dev,
                 libexpat1-dev,
 +# Make-Check   libffi-dev [!amd64],
                 libfuse-dev,
                 libgoogle-perftools-dev [i386 amd64 arm64],
  # Crimson      libgnutls28-dev,

diff --cc install-deps.sh
Simple merge

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/crimson/CMakeLists.txt
Simple merge

diff --cc src/include/config-h.in.cmake
Simple merge

diff --cc src/osd/ECBackend.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/PrimaryLogPG.cc
index 8cb6495a51a33525154ebd9a2a31511a27ae5fa6,45dfb065159987a65cce825fb1d893d9e427dd2a..c2937ecb23d9d09776cb242c4577a9789f54155b
--- 1/src/osd/PrimaryLogPG.cc
--- 2/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@@ -72,9 -70,10 +72,12 @@@
  #include <utility>
  
  #include <errno.h>
+ #ifdef HAVE_JAEGER
+ #include "common/tracer.h"
+ #endif
  
 +#include <common/CDC.h>
 +
  MEMPOOL_DEFINE_OBJECT_FACTORY(PrimaryLogPG, replicatedpg, osd);
  
  using std::list;

diff --cc src/osd/ReplicatedBackend.cc
Simple merge

diff --cc src/osd/scheduler/OpSchedulerItem.cc
Simple merge

diff --cc src/vstart.sh
Simple merge