enable sentry on arm64 (#119)

* enable sentry on arm64

4 files changed, 9 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90d8341c5..1ad3dc3c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 - Improvement: Retry writing GC state if it fails to handle transient problems
 - Improvement: If GC operation fails we report an error, after that errors are demoted to warnings until we manage to do a successful GC run. This is to reduce spam on Sentry.
 - Improvement: Removed stats for CId entries when doing GCv2 without cleaning up CId references
+- Improvement: Enabled Sentry support on arm64
 
 ## 5.5.3
 - Feature: New 'workspaces' service which allows a user to share a local folder via zenserver. A workspace can have mulitple workspace shares and they provie an HTTP API that is compatible with the project oplog HTTP API. Workspaces and shares are preserved between runs. Workspaces feature is disabled by default - enable with `--workspaces-enabled` option when launching zenserver.
diff --git a/src/zenserver/sentryintegration.cpp b/src/zenserver/sentryintegration.cpp
index 5d2b851d1..255030b2b 100644
--- a/src/zenserver/sentryintegration.cpp
+++ b/src/zenserver/sentryintegration.cpp
@@ -300,7 +300,10 @@ SentryIntegration::LogStartupInformation()
 		}
 		else
 		{
-			ZEN_WARN("sentry_init returned failure! (error code: {})", m_SentryErrorCode);
+			ZEN_WARN(
+				"sentry_init returned failure! (error code: {}) note that sentry expects crashpad_handler to exist alongside the running "
+				"executable",
+				m_SentryErrorCode);
 		}
 	}
 }
diff --git a/src/zenserver/sentryintegration.h b/src/zenserver/sentryintegration.h
index 29f526714..40e22af4e 100644
--- a/src/zenserver/sentryintegration.h
+++ b/src/zenserver/sentryintegration.h
@@ -6,12 +6,7 @@
 #include <zencore/zencore.h>
 
 #if !defined(ZEN_USE_SENTRY)
-#	if ZEN_PLATFORM_MAC && ZEN_ARCH_ARM64
-// vcpkg's sentry-native port does not support Arm on Mac.
-#		define ZEN_USE_SENTRY 0
-#	else
-#		define ZEN_USE_SENTRY 1
-#	endif
+#	define ZEN_USE_SENTRY 1
 #endif
 
 #if ZEN_USE_SENTRY
diff --git a/xmake.lua b/xmake.lua
index 845ac6660..62c02c629 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -39,8 +39,6 @@ if is_plat("windows") then
     add_requires("7z")
 end
 
-if not is_arch("arm64") then
-    add_requires("vcpkg::mimalloc")
     if has_config("zensentry") then
         if is_plat("linux") then
             add_requires("vcpkg::sentry-native 0.5.4")
@@ -48,6 +46,9 @@ if not is_arch("arm64") then
             add_requires("vcpkg::sentry-native")
         end
     end
+
+if not is_arch("arm64") then
+    add_requires("vcpkg::mimalloc")
 end
 
 add_rules("mode.debug", "mode.release")