void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-08-02 23:12:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

end spans before thread waits

Browse source 
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
This commit is contained in:
Grant Limberg 2025-07-15 11:10:19 -07:00
parent 4b6ff77fea
commit 7934fef84c
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
controller/CV2.cpp
View file

@ -776,6 +776,7 @@ void CV2::heartbeat()
} }
_pool->unborrow(c); _pool->unborrow(c);
span->End();
std::this_thread::sleep_for(std::chrono::seconds(1)); std::this_thread::sleep_for(std::chrono::seconds(1));
} }
@ -792,11 +793,6 @@ void CV2::membersDbWatcher()
MemberNotificationReceiver m(this, *c->c, stream); MemberNotificationReceiver m(this, *c->c, stream);
while (_run == 1) { 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); c->c->await_notification(5, 0);
} }
@ -816,11 +812,6 @@ void CV2::networksDbWatcher()
NetworkNotificationReceiver n(this, *c->c, stream); NetworkNotificationReceiver n(this, *c->c, stream);
while (_run == 1) { 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); c->c->await_notification(5, 0);
} }
@ -1214,6 +1205,8 @@ void CV2::onlineNotificationThread()
} }
_pool->unborrow(c2); _pool->unborrow(c2);
_pool->unborrow(c); _pool->unborrow(c);
span->End();
std::this_thread::sleep_for(std::chrono::seconds(10)); std::this_thread::sleep_for(std::chrono::seconds(10));
} }