cmake: set WITH_JAEGER=ON by default

Signed-off-by: Omri Zeneva <ozeneva@redhat.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4d6e14fbbcf4e7f43db118cff8252491eae6d30..629f0286b1a8345ec03f4e407ad8b3eefa295905 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -408,7 +408,7 @@ if(WITH_BLKIN)
   include_directories(SYSTEM src/blkin/blkin-lib)
 endif(WITH_BLKIN)
 
-option(WITH_JAEGER "Enable jaegertracing and it's dependent libraries" OFF)
+option(WITH_JAEGER "Enable jaegertracing and it's dependent libraries" ON)
 if(WITH_JAEGER)
   set(HAVE_JAEGER TRUE)
 endif()

diff --git a/src/rgw/rgw_process.cc b/src/rgw/rgw_process.cc
index a4d44267bfb4e31aee3c74984e557aca57975adb..5f54fa3544538df3d8627040245d7d5e2966a5c4 100644 (file)
--- a/src/rgw/rgw_process.cc
+++ b/src/rgw/rgw_process.cc
@@ -401,7 +401,7 @@ int process_request(rgw::sal::Store* const store,
   }
 
 done:
-  if (op) {
+  if (op && s->trace) {
     s->trace->SetAttribute(tracing::rgw::RETURN, op->get_ret());
     if (s->user) {
       s->trace->SetAttribute(tracing::rgw::USER_ID, s->user->get_id().id);