From 7934fef84c89b65c9d698d70e095f305031ca9ac Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 15 Jul 2025 11:10:19 -0700 Subject: [PATCH] end spans before thread waits also removed some spans from the networks/members db watcher. Those will be 5 seconds long no matter what, and the underlying processes already have their own spans --- controller/CV2.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/controller/CV2.cpp b/controller/CV2.cpp index b464f5e37..c1206de94 100644 --- a/controller/CV2.cpp +++ b/controller/CV2.cpp @@ -776,6 +776,7 @@ void CV2::heartbeat() } _pool->unborrow(c); + span->End(); std::this_thread::sleep_for(std::chrono::seconds(1)); } @@ -792,11 +793,6 @@ void CV2::membersDbWatcher() MemberNotificationReceiver m(this, *c->c, stream); while (_run == 1) { - auto provider = opentelemetry::trace::Provider::GetTracerProvider(); - auto tracer = provider->GetTracer("cv2"); - auto span = tracer->StartSpan("cv2::membersDbWatcher"); - auto scope = tracer->WithActiveSpan(span); - c->c->await_notification(5, 0); } @@ -816,11 +812,6 @@ void CV2::networksDbWatcher() NetworkNotificationReceiver n(this, *c->c, stream); while (_run == 1) { - auto provider = opentelemetry::trace::Provider::GetTracerProvider(); - auto tracer = provider->GetTracer("cv2"); - auto span = tracer->StartSpan("cv2::networksDbWatcher"); - auto scope = tracer->WithActiveSpan(span); - c->c->await_notification(5, 0); } @@ -1214,6 +1205,8 @@ void CV2::onlineNotificationThread() } _pool->unborrow(c2); _pool->unborrow(c); + span->End(); + std::this_thread::sleep_for(std::chrono::seconds(10)); }