Sentry: implement basic exception reporting, error breadcrumbs

src/Sentry.cpp

@@ -1,16 +1,35 @@
 #include "Sentry.h"
 #include "Common.h"
 
-#include "sentry.h"
-
-Sentry::Sentry(const std::string& SentryUrl) {
-    sentry_options_t* options = sentry_options_new();
-    sentry_options_set_dsn(options, SentryUrl.c_str());
-    auto ReleaseString = "BeamMP-Server@" + Application::ServerVersion();
-    sentry_options_set_release(options, ReleaseString.c_str());
-    sentry_init(options);
+TSentry::TSentry(const std::string& SentryUrl) {
+    if (SentryUrl.empty()) {
+        mValid = false;
+    } else {
+        mValid = true;
+        sentry_options_t* options = sentry_options_new();
+        sentry_options_set_dsn(options, SentryUrl.c_str());
+        auto ReleaseString = "BeamMP-Server@" + Application::ServerVersion();
+        sentry_options_set_release(options, ReleaseString.c_str());
+        sentry_init(options);
+    }
 }
 
-Sentry::~Sentry() {
-    sentry_close();
+TSentry::~TSentry() {
+    if (mValid) {
+        sentry_close();
+    }
+}
+
+void TSentry::Log(sentry_level_t level, const std::string& logger, const std::string& text) {
+    sentry_capture_event(sentry_value_new_message_event(level, logger.c_str(), text.c_str()));
+}
+
+void TSentry::LogException(const std::exception& e, const std::string& file, const std::string& line) {
+    Log(SENTRY_LEVEL_ERROR, "exceptions", std::string(e.what()) + " @ " + file + ":" + line);
+}
+
+void TSentry::AddErrorBreadcrumb(const std::string& msg, const std::string& file, const std::string& line) {
+    auto crumb = sentry_value_new_breadcrumb("default", (msg + " @ " + file + ":" + line).c_str());
+    sentry_value_set_by_key(crumb, "level", sentry_value_new_string("error"));
+    sentry_add_breadcrumb(crumb);
 }

src/main.cpp

@@ -35,7 +35,11 @@ void UnixSignalHandler(int sig) {
 }
 #endif // __unix
 
-int main(int argc, char** argv) {
+// this is provided by the build system, leave empty for source builds
+// global, yes, this is ugly, no, it cant be done another way
+TSentry Sentry { SECRET_SENTRY_URL };
+
+int main(int argc, char** argv) try {
 #ifdef __unix
 #if DEBUG
     info("registering handlers for SIGINT, SIGTERM, SIGPIPE");
@@ -46,27 +50,12 @@ int main(int argc, char** argv) {
     signal(SIGINT, UnixSignalHandler);
 #endif // DEBUG
 #endif // __unix
-
-    // FIXME: this is not prod ready, needs to be compile-time value
-    char* sentry_url = getenv("SENTRY_URL");
-    if (!sentry_url) {
-        error("no sentry url supplied in environment, this is not a fatal error");
-    } else {
-        info("sentry url has length " + std::to_string(std::string(sentry_url).size()));
-    }
-
-    Sentry sentry(sentry_url);
-
-    sentry_capture_event(sentry_value_new_message_event(
-        /*   level */ SENTRY_LEVEL_INFO,
-        /*  logger */ "custom",
-        /* message */ "It works!"));
-
     setlocale(LC_ALL, "C");
 
     bool Shutdown = false;
     Application::RegisterShutdownHandler([&Shutdown] { Shutdown = true; });
 
+
     TServer Server(argc, argv);
     TConfig Config;
 
@@ -89,4 +78,7 @@ int main(int argc, char** argv) {
     while (!Shutdown) {
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
+} catch (const std::exception& e) {
+    error(e.what());
+    Sentry.LogException(e, _file_basename, _line);
 }