From: Omri Zeneva <ozeneva@redhat.com>
Date: Sun, 13 Feb 2022 18:58:39 +0000 (+0200)
Subject: rgw,osd: convert tracer to be a global var
X-Git-Tag: v18.0.0~789^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d044c9ccd00ac70987c145d12c3eab99b837ddb0;p=ceph-ci.git

rgw,osd: convert tracer to be a global var

since we are using batch span processor, the tracer does not send the
spans by himself. so a single tracer is good enough.
Signed-off-by: Omri Zeneva <ozeneva@redhat.com>
---

diff --git a/src/common/tracer.cc b/src/common/tracer.cc
index f908ffe3185..1068bf5c2cc 100644
--- a/src/common/tracer.cc
+++ b/src/common/tracer.cc
@@ -33,12 +33,6 @@ void Tracer::init(opentelemetry::nostd::string_view service_name) {
   }
 }
 
-void Tracer::shutdown() {
-  if (tracer) {
-    tracer->CloseWithMicroseconds(1);
-  }
-}
-
 jspan Tracer::start_trace(opentelemetry::nostd::string_view trace_name) {
   if (is_enabled()) {
     return tracer->StartSpan(trace_name);
diff --git a/src/common/tracer.h b/src/common/tracer.h
index 1ad57e91f56..5d77a0dcf15 100644
--- a/src/common/tracer.h
+++ b/src/common/tracer.h
@@ -25,7 +25,6 @@ class Tracer {
   Tracer(opentelemetry::nostd::string_view service_name);
 
   void init(opentelemetry::nostd::string_view service_name);
-  void shutdown();
 
   bool is_enabled() const;
   // creates and returns a new span with `trace_name`
@@ -95,7 +94,6 @@ struct Tracer {
   jspan add_span(std::string_view, const jspan&) { return {}; }
   jspan add_span(std::string_view span_name, const jspan_context& parent_ctx) { return {}; }
   void init(std::string_view service_name) {}
-  void shutdown() {}
 };
   inline void encode(const jspan_context& span, bufferlist& bl, uint64_t f=0) {}
   inline void decode(jspan_context& span_ctx, ceph::buffer::list::const_iterator& bl) {}
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 51c07df2511..dc58cb43882 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4521,7 +4521,6 @@ int OSD::shutdown()
   utime_t duration = ceph_clock_now() - start_time_func;
   dout(0) <<"Slow Shutdown duration:" << duration << " seconds" << dendl;
 
-  tracing::osd::tracer.shutdown();
 
   return r;
 }
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index f2fc502a70f..1189e3660b6 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -334,7 +334,7 @@ int radosgw_Main(int argc, const char **argv)
     derr << "ERROR: unable to initialize rgw tools" << dendl;
     return -r;
   }
-
+  tracing::rgw::tracer.init("rgw");
   rgw_init_resolver();
   rgw::curl::setup_curl(fe_map);
   rgw_http_client_init(g_ceph_context);
diff --git a/src/rgw/rgw_tracer.cc b/src/rgw/rgw_tracer.cc
index 2d6720f591b..7e12bb2e62d 100644
--- a/src/rgw/rgw_tracer.cc
+++ b/src/rgw/rgw_tracer.cc
@@ -7,11 +7,7 @@
 namespace tracing {
 namespace rgw {
 
-#ifdef HAVE_JAEGER
-thread_local tracing::Tracer tracer("rgw");
-#else // !HAVE_JAEGER
 tracing::Tracer tracer;
-#endif
 
 } // namespace rgw
 } // namespace tracing
diff --git a/src/rgw/rgw_tracer.h b/src/rgw/rgw_tracer.h
index 77d4689d257..9cbae8b9c67 100644
--- a/src/rgw/rgw_tracer.h
+++ b/src/rgw/rgw_tracer.h
@@ -18,11 +18,7 @@ const auto TYPE = "type";
 const auto REQUEST = "request";
 const auto MULTIPART = "multipart_upload ";
 
-#ifdef HAVE_JAEGER
-extern thread_local tracing::Tracer tracer;
-#else
 extern tracing::Tracer tracer;
-#endif
 
 } // namespace rgw
 } // namespace tracing