From: Omri Zeneva <ozeneva@redhat.com>
Date: Thu, 20 Jan 2022 08:58:29 +0000 (-0500)
Subject: cmake: set WITH_JAEGER=ON by default
X-Git-Tag: v18.0.0~789^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=644c99826d73174e6609aa24b7297443358488b1;p=ceph.git

cmake: set WITH_JAEGER=ON by default

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4d6e14fbbcf..629f0286b1a8 100644
--- 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 a4d44267bfb4..5f54fa354453 100644
--- 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);