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

set errors in otel if/when they happen

Browse source
This commit is contained in:
Grant Limberg 2025-07-14 10:17:46 -07:00
parent 99cd9d174b
commit 3fd42ad2a0
2 changed files with 51 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
controller/CV1.cpp
View file

@ -530,6 +530,7 @@ AuthInfo CV1::getSSOAuthInfo(const nlohmann::json& member, const std::string& re
_pool->unborrow(c); _pool->unborrow(c);
} }
catch (std::exception& e) { catch (std::exception& e) {
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "ERROR: Error updating member on load for network %s: %s\n", networkId.c_str(), e.what()); fprintf(stderr, "ERROR: Error updating member on load for network %s: %s\n", networkId.c_str(), e.what());
} }
@ -815,11 +816,13 @@ void CV1::initializeNetworks()
fprintf(stderr, "network init done.\n"); fprintf(stderr, "network init done.\n");
} }
catch (sw::redis::Error& e) { catch (sw::redis::Error& e) {
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "ERROR: Error initializing networks in Redis: %s\n", e.what()); fprintf(stderr, "ERROR: Error initializing networks in Redis: %s\n", e.what());
std::this_thread::sleep_for(std::chrono::milliseconds(5000)); std::this_thread::sleep_for(std::chrono::milliseconds(5000));
exit(-1); exit(-1);
} }
catch (std::exception& e) { catch (std::exception& e) {
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "ERROR: Error initializing networks: %s\n", e.what()); fprintf(stderr, "ERROR: Error initializing networks: %s\n", e.what());
std::this_thread::sleep_for(std::chrono::milliseconds(5000)); std::this_thread::sleep_for(std::chrono::milliseconds(5000));
exit(-1); exit(-1);
@ -1088,10 +1091,12 @@ void CV1::initializeMembers()
} }
} }
catch (sw::redis::Error& e) { catch (sw::redis::Error& e) {
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "ERROR: Error initializing members (redis): %s\n", e.what()); fprintf(stderr, "ERROR: Error initializing members (redis): %s\n", e.what());
exit(-1); exit(-1);
} }
catch (std::exception& e) { catch (std::exception& e) {
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "ERROR: Error initializing member: %s-%s %s\n", networkId.c_str(), memberId.c_str(), e.what()); fprintf(stderr, "ERROR: Error initializing member: %s-%s %s\n", networkId.c_str(), memberId.c_str(), e.what());
exit(-1); exit(-1);
} }
@ -1283,6 +1288,7 @@ void CV1::_membersWatcher_Redis()
} }
} }
catch (sw::redis::Error& e) { catch (sw::redis::Error& e) {
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "Error in Redis members watcher: %s\n", e.what()); fprintf(stderr, "Error in Redis members watcher: %s\n", e.what());
} }
} }
@ -1392,6 +1398,7 @@ void CV1::_networksWatcher_Redis()
} }
} }
catch (sw::redis::Error& e) { catch (sw::redis::Error& e) {
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "Error in Redis networks watcher: %s\n", e.what()); fprintf(stderr, "Error in Redis networks watcher: %s\n", e.what());
} }
} }
@ -1583,6 +1590,7 @@ void CV1::commitThread()
} }
catch (std::exception& e) { catch (std::exception& e) {
fprintf(stderr, "%s ERROR: Error updating member %s-%s: %s\n", _myAddressStr.c_str(), networkId.c_str(), memberId.c_str(), e.what()); fprintf(stderr, "%s ERROR: Error updating member %s-%s: %s\n", _myAddressStr.c_str(), networkId.c_str(), memberId.c_str(), e.what());
mspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
} }
} }
else if (objtype == "network") { else if (objtype == "network") {
@ -1724,6 +1732,7 @@ void CV1::commitThread()
} }
} }
catch (std::exception& e) { catch (std::exception& e) {
nspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "%s ERROR: Error updating network: %s\n", _myAddressStr.c_str(), e.what()); fprintf(stderr, "%s ERROR: Error updating network: %s\n", _myAddressStr.c_str(), e.what());
} }
if (_redisMemberStatus) { if (_redisMemberStatus) {
@ -1739,6 +1748,7 @@ void CV1::commitThread()
} }
} }
catch (sw::redis::Error& e) { catch (sw::redis::Error& e) {
nspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "ERROR: Error adding network to Redis: %s\n", e.what()); fprintf(stderr, "ERROR: Error adding network to Redis: %s\n", e.what());
} }
} }
@ -1758,6 +1768,7 @@ void CV1::commitThread()
w.commit(); w.commit();
} }
catch (std::exception& e) { catch (std::exception& e) {
dspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "%s ERROR: Error deleting network: %s\n", _myAddressStr.c_str(), e.what()); fprintf(stderr, "%s ERROR: Error deleting network: %s\n", _myAddressStr.c_str(), e.what());
} }
if (_redisMemberStatus) { if (_redisMemberStatus) {
@ -1775,6 +1786,7 @@ void CV1::commitThread()
} }
} }
catch (sw::redis::Error& e) { catch (sw::redis::Error& e) {
dspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "ERROR: Error adding network to Redis: %s\n", e.what()); fprintf(stderr, "ERROR: Error adding network to Redis: %s\n", e.what());
} }
} }
@ -1795,6 +1807,7 @@ void CV1::commitThread()
w.commit(); w.commit();
} }
catch (std::exception& e) { catch (std::exception& e) {
mspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "%s ERROR: Error deleting member: %s\n", _myAddressStr.c_str(), e.what()); fprintf(stderr, "%s ERROR: Error deleting member: %s\n", _myAddressStr.c_str(), e.what());
} }
if (_redisMemberStatus) { if (_redisMemberStatus) {
@ -1813,6 +1826,7 @@ void CV1::commitThread()
} }
} }
catch (sw::redis::Error& e) { catch (sw::redis::Error& e) {
mspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "ERROR: Error deleting member from Redis: %s\n", e.what()); fprintf(stderr, "ERROR: Error deleting member from Redis: %s\n", e.what());
} }
} }
@ -1822,6 +1836,7 @@ void CV1::commitThread()
} }
} }
catch (std::exception& e) { catch (std::exception& e) {
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
fprintf(stderr, "%s ERROR: Error getting objtype: %s\n", _myAddressStr.c_str(), e.what()); fprintf(stderr, "%s ERROR: Error getting objtype: %s\n", _myAddressStr.c_str(), e.what());
} }
_pool->unborrow(c); _pool->unborrow(c);

46
controller/CV2.cpp
View file

@ -414,6 +414,7 @@ AuthInfo CV2::getSSOAuthInfo(const nlohmann::json& member, const std::string& re
} }
catch (std::exception& e) { catch (std::exception& e) {
fprintf(stderr, "ERROR: Error updating member on load for network %s: %s\n", networkId.c_str(), e.what()); fprintf(stderr, "ERROR: Error updating member on load for network %s: %s\n", networkId.c_str(), e.what());
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
} }
return info; // std::string(authenticationURL); return info; // std::string(authenticationURL);
@ -548,6 +549,7 @@ void CV2::initializeNetworks()
} }
catch (std::exception& e) { catch (std::exception& e) {
fprintf(stderr, "ERROR: Error initializing networks: %s\n", e.what()); fprintf(stderr, "ERROR: Error initializing networks: %s\n", e.what());
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
std::this_thread::sleep_for(std::chrono::milliseconds(5000)); std::this_thread::sleep_for(std::chrono::milliseconds(5000));
exit(-1); exit(-1);
} }
@ -706,6 +708,7 @@ void CV2::initializeMembers()
} }
catch (std::exception& e) { catch (std::exception& e) {
fprintf(stderr, "ERROR: Error initializing member: %s-%s %s\n", networkId.c_str(), memberId.c_str(), e.what()); fprintf(stderr, "ERROR: Error initializing member: %s-%s %s\n", networkId.c_str(), memberId.c_str(), e.what());
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
exit(-1); exit(-1);
} }
} }
@ -762,10 +765,12 @@ void CV2::heartbeat()
} }
catch (std::exception& e) { catch (std::exception& e) {
fprintf(stderr, "ERROR: Error in heartbeat: %s\n", e.what()); fprintf(stderr, "ERROR: Error in heartbeat: %s\n", e.what());
span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
continue; continue;
} }
catch (...) { catch (...) {
fprintf(stderr, "ERROR: Unknown error in heartbeat\n"); fprintf(stderr, "ERROR: Unknown error in heartbeat\n");
span->SetStatus(opentelemetry::trace::StatusCode::kError, "Unknown error in heartbeat");
continue; continue;
} }
} }
@ -858,8 +863,8 @@ void CV2::commitThread()
nlohmann::json& config = (qitem.first); nlohmann::json& config = (qitem.first);
const std::string objtype = config["objtype"]; const std::string objtype = config["objtype"];
if (objtype == "member") { if (objtype == "member") {
auto span = tracer->StartSpan("cv2::commitThread::member"); auto mspan = tracer->StartSpan("cv2::commitThread::member");
auto scope = tracer->WithActiveSpan(span); auto mscope = tracer->WithActiveSpan(span);
// fprintf(stderr, "%s: commitThread: member\n", _myAddressStr.c_str()); // fprintf(stderr, "%s: commitThread: member\n", _myAddressStr.c_str());
std::string memberId; std::string memberId;
@ -978,15 +983,21 @@ void CV2::commitThread()
if (s) { if (s) {
fprintf(stderr, "%s ERROR: SQL error: %s\n", _myAddressStr.c_str(), s->query().c_str()); fprintf(stderr, "%s ERROR: SQL error: %s\n", _myAddressStr.c_str(), s->query().c_str());
} }
mspan->SetStatus(opentelemetry::trace::StatusCode::kError, "pqxx::data_exception");
mspan->SetAttribute("error", e.what());
mspan->SetAttribute("config", cfgDump);
} }
catch (std::exception& e) { catch (std::exception& e) {
std::string cfgDump = OSUtils::jsonDump(config, 2); std::string cfgDump = OSUtils::jsonDump(config, 2);
fprintf(stderr, "%s ERROR: Error updating member %s-%s: %s\njsonDump: %s\n", _myAddressStr.c_str(), networkId.c_str(), memberId.c_str(), e.what(), cfgDump.c_str()); fprintf(stderr, "%s ERROR: Error updating member %s-%s: %s\njsonDump: %s\n", _myAddressStr.c_str(), networkId.c_str(), memberId.c_str(), e.what(), cfgDump.c_str());
mspan->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
mspan->SetAttribute("error", e.what());
mspan->SetAttribute("config", cfgDump);
} }
} }
else if (objtype == "network") { else if (objtype == "network") {
auto span = tracer->StartSpan("cv2::commitThread::network"); auto nspan = tracer->StartSpan("cv2::commitThread::network");
auto scope = tracer->WithActiveSpan(span); auto nscope = tracer->WithActiveSpan(span);
try { try {
// fprintf(stderr, "%s: commitThread: network\n", _myAddressStr.c_str()); // fprintf(stderr, "%s: commitThread: network\n", _myAddressStr.c_str());
@ -1027,19 +1038,23 @@ void CV2::commitThread()
if (s) { if (s) {
fprintf(stderr, "%s ERROR: SQL error: %s\n", _myAddressStr.c_str(), s->query().c_str()); fprintf(stderr, "%s ERROR: SQL error: %s\n", _myAddressStr.c_str(), s->query().c_str());
} }
nspan->SetStatus(opentelemetry::trace::StatusCode::kError, "pqxx::data_exception");
nspan->SetAttribute("error", e.what());
nspan->SetAttribute("config", OSUtils::jsonDump(config, 2));
} }
catch (std::exception& e) { catch (std::exception& e) {
fprintf(stderr, "%s ERROR: Error updating network: %s\n", _myAddressStr.c_str(), e.what()); fprintf(stderr, "%s ERROR: Error updating network: %s\n", _myAddressStr.c_str(), e.what());
nspan->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
nspan->SetAttribute("error", e.what());
nspan->SetAttribute("config", OSUtils::jsonDump(config, 2));
} }
} }
else if (objtype == "_delete_network") { else if (objtype == "_delete_network") {
auto span = tracer->StartSpan("cv2::commitThread::delete_network"); auto dspan = tracer->StartSpan("cv2::commitThread::delete_network");
auto scope = tracer->WithActiveSpan(span); auto dscope = tracer->WithActiveSpan(span);
// fprintf(stderr, "%s: commitThread: delete network\n", _myAddressStr.c_str()); // fprintf(stderr, "%s: commitThread: delete network\n", _myAddressStr.c_str());
try { try {
// don't think we need this. Deletion handled by CV2 API
pqxx::work w(*c->c); pqxx::work w(*c->c);
std::string networkId = config["id"]; std::string networkId = config["id"];
@ -1050,11 +1065,14 @@ void CV2::commitThread()
} }
catch (std::exception& e) { catch (std::exception& e) {
fprintf(stderr, "%s ERROR: Error deleting network: %s\n", _myAddressStr.c_str(), e.what()); fprintf(stderr, "%s ERROR: Error deleting network: %s\n", _myAddressStr.c_str(), e.what());
dspan->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
dspan->SetAttribute("error", e.what());
dspan->SetAttribute("config", OSUtils::jsonDump(config, 2));
} }
} }
else if (objtype == "_delete_member") { else if (objtype == "_delete_member") {
auto span = tracer->StartSpan("cv2::commitThread::delete_member"); auto dspan = tracer->StartSpan("cv2::commitThread::delete_member");
auto scope = tracer->WithActiveSpan(span); auto dscope = tracer->WithActiveSpan(span);
// fprintf(stderr, "%s commitThread: delete member\n", _myAddressStr.c_str()); // fprintf(stderr, "%s commitThread: delete member\n", _myAddressStr.c_str());
try { try {
@ -1069,6 +1087,9 @@ void CV2::commitThread()
} }
catch (std::exception& e) { catch (std::exception& e) {
fprintf(stderr, "%s ERROR: Error deleting member: %s\n", _myAddressStr.c_str(), e.what()); fprintf(stderr, "%s ERROR: Error deleting member: %s\n", _myAddressStr.c_str(), e.what());
dspan->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
dspan->SetAttribute("error", e.what());
dspan->SetAttribute("config", OSUtils::jsonDump(config, 2));
} }
} }
else { else {
@ -1077,6 +1098,8 @@ void CV2::commitThread()
} }
catch (std::exception& e) { catch (std::exception& e) {
fprintf(stderr, "%s ERROR: Error getting objtype: %s\n", _myAddressStr.c_str(), e.what()); fprintf(stderr, "%s ERROR: Error getting objtype: %s\n", _myAddressStr.c_str(), e.what());
span->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
span->SetAttribute("error", e.what());
} }
_pool->unborrow(c); _pool->unborrow(c);
c.reset(); c.reset();
@ -1182,9 +1205,12 @@ void CV2::onlineNotificationThread()
} }
catch (std::exception& e) { catch (std::exception& e) {
fprintf(stderr, "%s ERROR: Error in onlineNotificationThread: %s\n", _myAddressStr.c_str(), e.what()); fprintf(stderr, "%s ERROR: Error in onlineNotificationThread: %s\n", _myAddressStr.c_str(), e.what());
span->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
span->SetAttribute("error", e.what());
} }
catch (...) { catch (...) {
fprintf(stderr, "%s ERROR: Unknown error in onlineNotificationThread\n", _myAddressStr.c_str()); fprintf(stderr, "%s ERROR: Unknown error in onlineNotificationThread\n", _myAddressStr.c_str());
span->SetStatus(opentelemetry::trace::StatusCode::kError, "unknown");
} }
_pool->unborrow(c2); _pool->unborrow(c2);
_pool->unborrow(c); _pool->unborrow(c);