From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Thu, 3 Dec 2020 13:10:09 +0000 (+0530)
Subject: jaeger: make tracing default turned off, until teuthology integration
X-Git-Tag: v16.1.0~250^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85ca7b36a049c3b92c45a33dac05cde722ba3fc1;p=ceph.git

jaeger: make tracing default turned off, until teuthology integration

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d91ba8119e4d..7304b42f7808 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,7 +364,7 @@ if(WITH_BLKIN)
   include_directories(SYSTEM src/blkin/blkin-lib)
 endif(WITH_BLKIN)
 
-option(WITH_JAEGER "Enable jaegertracing and it's dependent libraries" ON)
+option(WITH_JAEGER "Enable jaegertracing and it's dependent libraries" OFF)
 if(WITH_JAEGER)
   set(HAVE_JAEGER TRUE)
 endif()
diff --git a/ceph.spec.in b/ceph.spec.in
index ef2c766ddb0c..a5724cee8cf3 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -61,7 +61,7 @@
 %endif
 %endif
 %bcond_with seastar
-%bcond_without jaeger
+%bcond_with jaeger
 %if 0%{?fedora} || 0%{?suse_version} >= 1500
 # distros that ship cmd2 and/or colorama
 %bcond_without cephfs_shell
diff --git a/debian/libjaeger.install b/debian/libjaeger.install
index e7cb033ac528..71d8caaf6df1 100644
--- a/debian/libjaeger.install
+++ b/debian/libjaeger.install
@@ -1,3 +1,3 @@
-usr/lib/libopentracing.so.*
-usr/lib/libjaegertracing.so.*
-usr/lib/libthrift.so.*
+#usr/lib/libopentracing.so.*
+#usr/lib/libjaegertracing.so.*
+#usr/lib/libthrift.so.*
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ef8a5f206107..097af03a9232 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -396,6 +396,9 @@ if(WITH_JAEGER)
     set(jaeger_libs ${CMAKE_BINARY_DIR}/external/lib/libyaml-cpp.so
 		    ${CMAKE_BINARY_DIR}/external/lib/libyaml-cpp.so.0.6
 		    ${CMAKE_BINARY_DIR}/external/lib/libyaml-cpp.so.0.6.2)
+    #customize libjaeger.install
+    execute_process(COMMAND bash -c "sed -i 's/#//' debian/libjaeger.install"
+		    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
     execute_process(COMMAND bash -c "grep -q 'yaml-cpp' debian/libjaeger.install || echo 'usr/lib/libyaml-cpp.so.*' >> debian/libjaeger.install"
 		    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
   endif()