From 4ec4f949fd94bb33b5bfbc8df3b39f273af6c874 Mon Sep 17 00:00:00 2001 From: Omri Zeneva Date: Sun, 2 Oct 2022 03:30:35 -0400 Subject: [PATCH] common/tracer: remove is_enabled check in add_span methods when tracing is disabled globally, new spans won't be added to existing traces, because of that if condition. this can happen also if a specific trace was enabled by lua script so in case tracing is disabled, the tracer will create new spans if it's parent span is not a noop span, regardless of tracer state Signed-off-by: Omri Zeneva --- src/common/tracer.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/common/tracer.cc b/src/common/tracer.cc index d822e274b43..1146da31950 100644 --- a/src/common/tracer.cc +++ b/src/common/tracer.cc @@ -60,8 +60,7 @@ jspan Tracer::start_trace(opentelemetry::nostd::string_view trace_name, bool tra } jspan Tracer::add_span(opentelemetry::nostd::string_view span_name, const jspan& parent_span) { - ceph_assert(cct); - if (is_enabled() && parent_span->IsRecording()) { + if (parent_span && parent_span->IsRecording()) { ceph_assert(tracer); opentelemetry::trace::StartSpanOptions span_opts; span_opts.parent = parent_span->GetContext(); @@ -72,8 +71,7 @@ jspan Tracer::add_span(opentelemetry::nostd::string_view span_name, const jspan& } jspan Tracer::add_span(opentelemetry::nostd::string_view span_name, const jspan_context& parent_ctx) { - ceph_assert(cct); - if (is_enabled() && parent_ctx.IsValid()) { + if (parent_ctx.IsValid()) { ceph_assert(tracer); opentelemetry::trace::StartSpanOptions span_opts; span_opts.parent = parent_ctx; -- 2.39.5