WIP sentry support

Author: edolstra

nix-meson-build-support/common/assert-fail/meson.build

@@ -24,9 +24,9 @@ can_wrap_assert_fail = cxx.links(
   name : 'linker can wrap __assert_fail',
 )
 
-if can_wrap_assert_fail
-  deps_other += declare_dependency(
-    sources : 'wrap-assert-fail.cc',
-    link_args : wrap_assert_fail_args,
-  )
-endif
+#if can_wrap_assert_fail
+#  deps_other += declare_dependency(
+#    sources : 'wrap-assert-fail.cc',
+#    link_args : wrap_assert_fail_args,
+#  )
+#endif

packaging/dependencies.nix

@@ -147,4 +147,9 @@ scope: {
     pslSupport = !stdenv.hostPlatform.isStatic;
     idnSupport = !stdenv.hostPlatform.isStatic;
   };
+
+  sentry-native = pkgs.sentry-native.override {
+    # Avoid having two curls in our closure.
+    inherit (scope) curl;
+  };
 }

packaging/everything.nix

@@ -44,6 +44,10 @@
   testers,
 
   patchedSrc ? null,
+
+  curl,
+  boehmgc,
+  sentry-native,
 }:
 
 let
@@ -155,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: {
     let
       devPaths = lib.mapAttrsToList (_k: lib.getDev) finalAttrs.finalPackage.libs;
       debugPaths = lib.map (lib.getOutput "debug") (
-        lib.attrValues finalAttrs.finalPackage.libs ++ [ nix-cli ]
+        lib.attrValues finalAttrs.finalPackage.libs ++ [ nix-cli curl boehmgc sentry-native ]
       );
     in
     ''

src/libmain/unix/stack.cc

@@ -45,7 +45,7 @@ static void sigsegvHandler(int signo, siginfo_t * info, void * ctx)
 
 void detectStackOverflow()
 {
-#if defined(SA_SIGINFO) && defined(SA_ONSTACK)
+#if defined(SA_SIGINFO) && defined(SA_ONSTACK) && 0
     /* Install a SIGSEGV handler to detect stack overflows.  This
        requires an alternative stack, otherwise the signal cannot be
        delivered when we're out of stack space. */

src/nix/main.cc

@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <regex>
 #include <nlohmann/json.hpp>
+#include <sentry.h>
 
 #ifndef _WIN32
 #  include <sys/socket.h>
@@ -378,7 +379,24 @@ void mainWrapped(int argc, char ** argv)
 {
     savedArgv = argv;
 
-    registerCrashHandler();
+    bool sentryEnabled = false;
+
+    if (getEnv("NIX_DISABLE_SENTRY").value_or("") != "1") {
+        sentry_options_t * options = sentry_options_new();
+        sentry_options_set_dsn(
+            options, "https://ca42fa4b6b08ae1caf3d96b998af6bac@o4506062689927168.ingest.us.sentry.io/4511151087878144");
+        sentry_options_set_database_path(options, (getCacheDir() / "sentry").string().c_str());
+        sentry_options_set_release(options, fmt("nix@%s", determinateNixVersion).c_str());
+        sentry_options_set_traces_sample_rate(options, 0);
+        sentry_options_set_auto_session_tracking(options, false);
+        sentry_init(options);
+        sentryEnabled = true;
+    }
+
+    Finally cleanupSentry([]() { sentry_shutdown(); });
+
+    if (!sentryEnabled)
+        registerCrashHandler();
 
     /* The chroot helper needs to be run before any threads have been
        started. */

src/nix/meson.build

@@ -191,7 +191,7 @@ this_exe = executable(
   sources,
   dependencies : deps_private_subproject + deps_private + deps_other,
   include_directories : include_dirs,
-  link_args : linker_export_flags,
+  link_args : linker_export_flags + [ '-lsentry' ],
   install : true,
   cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
 )

src/nix/package.nix

@@ -8,6 +8,7 @@
   nix-expr,
   nix-main,
   nix-cmd,
+  sentry-native,
 
   # Configuration Options
 
@@ -70,6 +71,7 @@ mkMesonExecutable (finalAttrs: {
     nix-expr
     nix-main
     nix-cmd
+    sentry-native
   ]
   ++ lib.optional (
     stdenv.cc.isClang

tests/functional/common/init.sh

@@ -3,6 +3,9 @@
 # for shellcheck
 : "${test_nix_conf_dir?}" "${test_nix_conf?}"
 
+# Don't upload crashes from tests to Sentry.
+export NIX_DISABLE_SENTRY=1
+
 if isTestOnNixOS; then
 
   mkdir -p "$test_nix_conf_dir" "$TEST_HOME"