From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 16 Dec 2020 00:29:26 +0000 (-0800)
Subject: Merge pull request #31358 from ideepika/wip-jaegertracing-in-ceph
X-Git-Tag: v16.1.0~250
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a74a937ddcfc1971457464dbe421dcc0d755492;p=ceph.git

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

jaegertracing build/ops integration

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

8a74a937ddcfc1971457464dbe421dcc0d755492
diff --cc debian/control
index 4a89172aff9e,50e2f665adfb..e894e5028f24
--- a/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 src/osd/PrimaryLogPG.cc
index 8cb6495a51a3,45dfb0651599..c2937ecb23d9
--- a/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;