update ceph source to reef 18.1.2

[ceph.git] / ceph / src / common / tracer.cc

diff --git a/ceph/src/common/tracer.cc b/ceph/src/common/tracer.cc
index f10e0598a93415f973082fe2c84fe4cabd2a44e3..ffabc0b20a111adeac444019c386deefc4c2ddf8 100644 (file)
--- a/ceph/src/common/tracer.cc
+++ b/ceph/src/common/tracer.cc
@@ -6,11 +6,14 @@
 #include "tracer.h"
 
 #ifdef HAVE_JAEGER
-
+#include "opentelemetry/sdk/trace/batch_span_processor.h"
+#include "opentelemetry/sdk/trace/tracer_provider.h"
+#include "opentelemetry/exporters/jaeger/jaeger_exporter.h"
 
 namespace tracing {
 
 const opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> Tracer::noop_tracer = opentelemetry::trace::Provider::GetTracerProvider()->GetTracer("no-op", OPENTELEMETRY_SDK_VERSION);
+const jspan Tracer::noop_span = noop_tracer->StartSpan("noop");
 
 using bufferlist = ceph::buffer::list;
 
@@ -20,34 +23,41 @@ Tracer::Tracer(opentelemetry::nostd::string_view service_name) {
 
 void Tracer::init(opentelemetry::nostd::string_view service_name) {
   if (!tracer) {
-    const opentelemetry::exporter::jaeger::JaegerExporterOptions opts;
-    auto jaeger_exporter  = std::unique_ptr<opentelemetry::sdk::trace::SpanExporter>(new opentelemetry::exporter::jaeger::JaegerExporter(opts));
-    auto processor = std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor>(new opentelemetry::sdk::trace::SimpleSpanProcessor(std::move(jaeger_exporter)));
+    opentelemetry::exporter::jaeger::JaegerExporterOptions exporter_options;
+    if (g_ceph_context) {
+      exporter_options.server_port = g_ceph_context->_conf.get_val<int64_t>("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<opentelemetry::sdk::trace::SpanExporter>(new opentelemetry::exporter::jaeger::JaegerExporter(exporter_options));
+    auto processor = std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor>(new opentelemetry::sdk::trace::BatchSpanProcessor(std::move(jaeger_exporter), processor_options));
     const auto provider = opentelemetry::nostd::shared_ptr<opentelemetry::trace::TracerProvider>(new opentelemetry::sdk::trace::TracerProvider(std::move(processor), jaeger_resource));
+    opentelemetry::trace::Provider::SetTracerProvider(provider);
     tracer = provider->GetTracer(service_name, OPENTELEMETRY_SDK_VERSION);
   }
 }
 
-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);
   }
+  return noop_span;
 }
 
-jspan Tracer::start_trace(opentelemetry::nostd::string_view trace_name) {
-  if (is_enabled()) {
+jspan Tracer::start_trace(opentelemetry::nostd::string_view trace_name, bool trace_is_enabled) {
+  if (trace_is_enabled) {
     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) {
-  if (is_enabled() && parent_span) {
-    const auto parent_ctx = parent_span->GetContext();
-    return add_span(span_name, parent_ctx);
+  if (is_enabled() && parent_span->IsRecording()) {
+    opentelemetry::trace::StartSpanOptions span_opts;
+    span_opts.parent = parent_span->GetContext();
+    return tracer->StartSpan(span_name, span_opts);
   }
-  return noop_tracer->StartSpan(span_name);
+  return noop_span;
 }
 
 jspan Tracer::add_span(opentelemetry::nostd::string_view span_name, const jspan_context& parent_ctx) {
@@ -56,7 +66,7 @@ jspan Tracer::add_span(opentelemetry::nostd::string_view span_name, const jspan_
     span_opts.parent = parent_ctx;
     return tracer->StartSpan(span_name, span_opts);
   }
-  return noop_tracer->StartSpan(span_name);
+  return noop_span;
 }
 
 bool Tracer::is_enabled() const {