From: Yuval Lifshitz Date: Fri, 14 Jul 2023 14:18:21 +0000 (+0000) Subject: common/trace: pass ceph context explicitly to the tracer X-Git-Tag: v19.0.0~551^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0d176b592d804f58b38b61e7be6f6cdbdfa4324;p=ceph.git common/trace: pass ceph context explicitly to the tracer Signed-off-by: Yuval Lifshitz --- diff --git a/src/common/tracer.cc b/src/common/tracer.cc index 1d6901b895b..aab3c1e9308 100644 --- a/src/common/tracer.cc +++ b/src/common/tracer.cc @@ -2,7 +2,6 @@ // vim: ts=8 sw=2 smarttab #include "common/ceph_context.h" -#include "global/global_context.h" #include "tracer.h" #include "common/debug.h" @@ -11,10 +10,9 @@ #include "opentelemetry/sdk/trace/tracer_provider.h" #include "opentelemetry/exporters/jaeger/jaeger_exporter.h" -#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix -#define dout_prefix *_dout << "opentelemetry_jaeger_tracing " +#define dout_prefix (*_dout << "otel_tracing: ") namespace tracing { @@ -23,17 +21,13 @@ const jspan Tracer::noop_span = noop_tracer->StartSpan("noop"); using bufferlist = ceph::buffer::list; -Tracer::Tracer(opentelemetry::nostd::string_view service_name) { - init(service_name); -} - -void Tracer::init(opentelemetry::nostd::string_view service_name) { +void Tracer::init(CephContext* _cct, opentelemetry::nostd::string_view service_name) { + ceph_assert(_cct); + cct = _cct; if (!tracer) { - dout(3) << "tracer was not loaded, initializing tracing" << dendl; + ldout(cct, 3) << "tracer was not loaded, initializing tracing" << dendl; opentelemetry::exporter::jaeger::JaegerExporterOptions exporter_options; - if (g_ceph_context) { - exporter_options.server_port = g_ceph_context->_conf.get_val("jaeger_agent_port"); - } + exporter_options.server_port = cct->_conf.get_val("jaeger_agent_port"); const opentelemetry::sdk::trace::BatchSpanProcessorOptions processor_options; const auto jaeger_resource = opentelemetry::sdk::resource::Resource::Create(std::move(opentelemetry::sdk::resource::ResourceAttributes{{"service.name", service_name}})); auto jaeger_exporter = std::unique_ptr(new opentelemetry::exporter::jaeger::JaegerExporter(exporter_options)); @@ -45,44 +39,52 @@ void Tracer::init(opentelemetry::nostd::string_view service_name) { } jspan Tracer::start_trace(opentelemetry::nostd::string_view trace_name) { + ceph_assert(cct); if (is_enabled()) { - dout(20) << "start trace for " << trace_name << " " << dendl; + ceph_assert(tracer); + ldout(cct, 20) << "start trace for " << trace_name << " " << dendl; return tracer->StartSpan(trace_name); } return noop_span; } jspan Tracer::start_trace(opentelemetry::nostd::string_view trace_name, bool trace_is_enabled) { - dout(20) << "start trace enabled " << trace_is_enabled << " " << dendl; + ceph_assert(cct); + ldout(cct, 20) << "start trace enabled " << trace_is_enabled << " " << dendl; if (trace_is_enabled) { - dout(20) << "start trace for " << trace_name << " " << dendl; + ceph_assert(tracer); + ldout(cct, 20) << "start trace for " << trace_name << " " << dendl; return tracer->StartSpan(trace_name); } return noop_tracer->StartSpan(trace_name); } jspan Tracer::add_span(opentelemetry::nostd::string_view span_name, const jspan& parent_span) { + ceph_assert(cct); if (is_enabled() && parent_span->IsRecording()) { + ceph_assert(tracer); opentelemetry::trace::StartSpanOptions span_opts; span_opts.parent = parent_span->GetContext(); - dout(20) << "adding span " << span_name << " " << dendl; + ldout(cct, 20) << "adding span " << span_name << " " << dendl; return tracer->StartSpan(span_name, span_opts); } return noop_span; } jspan Tracer::add_span(opentelemetry::nostd::string_view span_name, const jspan_context& parent_ctx) { + ceph_assert(cct); if (is_enabled() && parent_ctx.IsValid()) { + ceph_assert(tracer); opentelemetry::trace::StartSpanOptions span_opts; span_opts.parent = parent_ctx; - dout(20) << "adding span " << span_name << " " << dendl; + ldout(cct, 20) << "adding span " << span_name << " " << dendl; return tracer->StartSpan(span_name, span_opts); } return noop_span; } bool Tracer::is_enabled() const { - return g_ceph_context->_conf->jaeger_tracing_enable; + return cct->_conf->jaeger_tracing_enable; } void encode(const jspan_context& span_ctx, bufferlist& bl, uint64_t f) { @@ -123,3 +125,4 @@ void decode(jspan_context& span_ctx, bufferlist::const_iterator& bl) { } // namespace tracing #endif // HAVE_JAEGER + diff --git a/src/common/tracer.h b/src/common/tracer.h index 9d13c78aafc..decbca55124 100644 --- a/src/common/tracer.h +++ b/src/common/tracer.h @@ -19,13 +19,13 @@ class Tracer { private: const static opentelemetry::nostd::shared_ptr noop_tracer; const static jspan noop_span; + CephContext* cct = nullptr;; opentelemetry::nostd::shared_ptr tracer; public: Tracer() = default; - Tracer(opentelemetry::nostd::string_view service_name); - void init(opentelemetry::nostd::string_view service_name); + void init(CephContext* _cct, opentelemetry::nostd::string_view service_name); bool is_enabled() const; // creates and returns a new span with `trace_name` diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 488c22f0a2a..14094625d14 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -3608,7 +3608,7 @@ int OSD::init() std::lock_guard lock(osd_lock); if (is_stopping()) return 0; - tracing::osd::tracer.init("osd"); + tracing::osd::tracer.init(cct, "osd"); tick_timer.init(); tick_timer_without_osd_lock.init(); service.recovery_request_timer.init(); diff --git a/src/rgw/rgw_appmain.cc b/src/rgw/rgw_appmain.cc index 40373d82cba..ebad686e354 100644 --- a/src/rgw/rgw_appmain.cc +++ b/src/rgw/rgw_appmain.cc @@ -529,7 +529,7 @@ void rgw::AppMain::init_tracepoints() { TracepointProvider::initialize(dpp->get_cct()); TracepointProvider::initialize(dpp->get_cct()); - tracing::rgw::tracer.init("rgw"); + tracing::rgw::tracer.init(dpp->get_cct(), "rgw"); } /* init_tracepoints() */ void rgw::AppMain::init_notification_endpoints() diff --git a/src/rgw/rgw_tracer.cc b/src/rgw/rgw_tracer.cc index 7e12bb2e62d..f48988111c0 100644 --- a/src/rgw/rgw_tracer.cc +++ b/src/rgw/rgw_tracer.cc @@ -1,7 +1,6 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include #include "rgw_tracer.h" namespace tracing { diff --git a/src/test/rgw/test_rgw_lua.cc b/src/test/rgw/test_rgw_lua.cc index 0c348e01cfa..6dc6f17e0db 100644 --- a/src/test/rgw/test_rgw_lua.cc +++ b/src/test/rgw/test_rgw_lua.cc @@ -164,7 +164,7 @@ CctCleaner cleaner(g_cct); tracing::Tracer tracer; #define DEFINE_REQ_STATE RGWProcessEnv pe; RGWEnv e; req_state s(g_cct, pe, &e, 0); -#define INIT_TRACE tracer.init("test"); \ +#define INIT_TRACE tracer.init(g_cct, "test"); \ s.trace = tracer.start_trace("test", true); TEST(TestRGWLua, EmptyScript)