[Mac] add support for Sentry breadcrumbs / warnings /actions

Author: sandboxcoder

obs-studio-server/source/nodeobs_api.cpp

@@ -885,9 +885,7 @@ void OBS_API::OBS_API_initAPI(void *data, const int64_t id, const std::vector<ip
 	before attempting to make a file there. */
 	if (os_mkdirs(log_path.c_str()) == MKDIR_ERROR) {
 		std::cerr << "Failed to open log file" << std::endl;
-#ifdef WIN32
 		util::CrashManager::AddWarning("Error on log file, failed to create path: " + log_path);
-#endif
 	}
 
 	/* Delete oldest file in the folder to imitate rotating */
@@ -925,7 +923,6 @@ void OBS_API::OBS_API_initAPI(void *data, const int64_t id, const std::vector<ip
 		}
 	}
 
-#ifdef WIN32
 	// Register the pre and post server callbacks to log the data into the crashmanager
 	g_server->set_pre_callback(
 		[](std::string cname, std::string fname, const std::vector<ipc::value> &args, void *data) {
@@ -941,7 +938,6 @@ void OBS_API::OBS_API_initAPI(void *data, const int64_t id, const std::vector<ip
 		&crashManager);
 
 #endif
-#endif
 
 #ifdef WIN32
 	// Connect the metrics provider with our crash handler process, sending our current version tag

obs-studio-server/source/nodeobs_service.cpp

@@ -1175,8 +1175,12 @@ void OBS_service::setupRecordingAudioEncoder(void)
 
 		AdvancedRecordingAudioEncodersID[i] = "";
 		if (!createAudioEncoder(&(AdvancedRecordingAudioTracks[i]), AdvancedRecordingAudioEncodersID[i], id, GetAdvancedAudioBitrate(i),
-					nameStream.str().c_str(), i))
+					nameStream.str().c_str(), i)) {
+			std::ostringstream errorStream;
+			errorStream << "audio encoder failed id: " << id << nameStream.str();
+			util::CrashManager::AddWarning(errorStream.str());
 			throw std::runtime_error("Failed to create audio encoder (advanced output)");
+		}
 		obs_encoder_set_audio(AdvancedRecordingAudioTracks[i], obs_get_audio());
 	}
 }

obs-studio-server/source/util-crashmanager.cpp

@@ -69,15 +69,15 @@
 //////////////////////
 // STATIC VARIABLES //
 //////////////////////
+std::vector<nlohmann::json> breadcrumbs;
+std::mutex messageMutex;
+std::vector<std::string> warnings;
+std::queue<std::pair<int, std::string>> lastActions;
 #ifdef WIN32
 // Global/static variables
 std::vector<std::string> handledOBSCrashes;
 PDH_HQUERY cpuQuery;
 PDH_HCOUNTER cpuTotal;
-std::vector<nlohmann::json> breadcrumbs;
-std::queue<std::pair<int, std::string>> lastActions;
-std::vector<std::string> warnings;
-std::mutex messageMutex;
 util::MetricsProvider metricsClient;
 LPTOP_LEVEL_EXCEPTION_FILTER crashpadInternalExceptionFilterMethod = nullptr;
 HANDLE memoryDumpEvent = INVALID_HANDLE_VALUE;
@@ -998,16 +998,12 @@ nlohmann::json util::CrashManager::RequestOBSLog(OBSLogType type)
 
 nlohmann::json util::CrashManager::ComputeBreadcrumbs()
 {
-#ifdef WIN32
 	nlohmann::json result = nlohmann::json::array();
 
 	for (auto &msg : breadcrumbs)
 		result.push_back(msg);
 
 	return result;
-#else
-	return NULL;
-#endif
 }
 
 nlohmann::json util::CrashManager::ComputeActions()
@@ -1036,16 +1032,12 @@ nlohmann::json util::CrashManager::ComputeActions()
 
 nlohmann::json util::CrashManager::ComputeWarnings()
 {
-#ifdef WIN32
 	nlohmann::json result;
 
 	for (auto &msg : warnings)
 		result.push_back(msg);
 
 	return result;
-#else
-	return NULL;
-#endif
 }
 
 void BindCrtHandlesToStdHandles(bool bindStdIn, bool bindStdOut, bool bindStdErr)
@@ -1203,15 +1195,12 @@ void util::CrashManager::IPCValuesToData(const std::vector<ipc::value> &values,
 
 void util::CrashManager::AddWarning(const std::string &warning)
 {
-#ifdef WIN32
 	std::lock_guard<std::mutex> lock(messageMutex);
 	warnings.push_back(warning);
-#endif
 }
 
 void RegisterAction(const std::string &message)
 {
-#ifdef WIN32
 	static const int MaximumActionsRegistered = 50;
 	std::lock_guard<std::mutex> lock(messageMutex);
 
@@ -1224,34 +1213,27 @@ void RegisterAction(const std::string &message)
 			lastActions.pop();
 		}
 	}
-#endif
 }
 
 void util::CrashManager::AddBreadcrumb(const nlohmann::json &message)
 {
-#ifdef WIN32
 	std::lock_guard<std::mutex> lock(messageMutex);
 	breadcrumbs.push_back(message);
-#endif
 }
 
 void util::CrashManager::AddBreadcrumb(const std::string &message)
 {
-#ifdef WIN32
 	nlohmann::json j = nlohmann::json::array();
 	j.push_back({{message}});
 
 	std::lock_guard<std::mutex> lock(messageMutex);
 	breadcrumbs.push_back(j);
-#endif
 }
 
 void util::CrashManager::ClearBreadcrumbs()
 {
-#ifdef WIN32
 	std::lock_guard<std::mutex> lock(messageMutex);
 	breadcrumbs.clear();
-#endif
 }
 
 void util::CrashManager::setAppState(const std::string &newState)