From: Omri Zeneva <ozeneva@redhat.com>
Date: Sun, 2 Oct 2022 07:30:35 +0000 (-0400)
Subject: common/tracer: remove is_enabled check in add_span methods
X-Git-Tag: v19.0.0~396^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ec4f949fd94bb33b5bfbc8df3b39f273af6c874;p=ceph.git

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 <ozeneva@redhat.com>
---

diff --git a/src/common/tracer.cc b/src/common/tracer.cc
index d822e274b43e..1146da319500 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;