STAFF-120395: add app relaunch on crash (#4)

* STAFF-120395: add app relaunch on crash

* STAFF-120395: update to td version of crashpad

* STAFF-120395: add ability to pass argv to crashpad relaunch

* STAFF-120395: add ability to pass argv to crashpad relaunch 2

* STAFF-120395: update crashpad

* STAFF-120395: update crashpad

* STAFF-120395: fix relaunch annotation

* STAFF-120395: update crashpad

* STAFF-120395: update crashpad

* update crashpad

* update crashpad

* update crashpad

.gitmodules

@@ -9,5 +9,5 @@
 	url = https://chromium.googlesource.com/linux-syscall-support
 [submodule "external/crashpad"]
 	path = external/crashpad
-	url = https://github.com/getsentry/crashpad.git
-	branch = getsentry
+	url = https://github.com/mystaff/crashpad.git
+	branch = timedoctor

include/sentry.h

@@ -708,6 +708,19 @@ SENTRY_API void sentry_options_set_release(
  */
 SENTRY_API const char *sentry_options_get_release(const sentry_options_t *opts);
 
+/**
+ * Sets the args passed to the process when relaunching after a crash.
+ * Args must be in 1 single string separated by |
+ */
+SENTRY_API void sentry_options_set_relaunch_argv(
+    sentry_options_t *opts, const char *relaunch_argv);
+
+/**
+ * Gets the args passsed to the process when relaunching after a crash.
+ */
+SENTRY_API const char *sentry_options_get_relaunch_argv(
+    const sentry_options_t *opts);
+
 /**
  * Sets the environment.
  */

src/backends/sentry_backend_crashpad.cpp

@@ -39,6 +39,22 @@ extern "C" {
 #    pragma warning(pop)
 #endif
 
+#if defined(SENTRY_PLATFORM_WINDOWS)
+#    include <process.h>
+static int
+td__getpid()
+{
+    return _getpid();
+}
+#else
+#    include <unistd.h>
+static int
+td__getpid()
+{
+    return getpid();
+}
+#endif
+
 extern "C" {
 
 #ifdef SENTRY_PLATFORM_LINUX
@@ -192,6 +208,14 @@ sentry__crashpad_backend_startup(
     std::map<std::string, std::string> annotations;
     std::vector<base::FilePath> attachments;
 
+    sentry_path_t *current_exe = sentry__path_current_exe();
+    if (current_exe && options->relaunch_argv) {
+        annotations["__td-crashed-pid"] = std::to_string(td__getpid());
+        annotations["__td-relaunch-path"] = std::string(current_exe->path);
+        annotations["__td-relaunch-argv"] = std::string(options->relaunch_argv);
+        sentry__path_free(current_exe);
+    }
+
     // register attachments
     for (sentry_attachment_t *attachment = options->attachments; attachment;
          attachment = attachment->next) {

src/sentry_options.c

@@ -74,6 +74,7 @@ sentry_options_free(sentry_options_t *opts)
     }
     sentry__dsn_decref(opts->dsn);
     sentry_free(opts->release);
+    sentry_free(opts->relaunch_argv);
     sentry_free(opts->environment);
     sentry_free(opts->dist);
     sentry_free(opts->http_proxy);
@@ -155,6 +156,20 @@ sentry_options_get_release(const sentry_options_t *opts)
     return opts->release;
 }
 
+void
+sentry_options_set_relaunch_argv(
+    sentry_options_t *opts, const char *relaunch_argv)
+{
+    sentry_free(opts->relaunch_argv);
+    opts->relaunch_argv = sentry__string_clone(relaunch_argv);
+}
+
+const char *
+sentry_options_get_relaunch_argv(const sentry_options_t *opts)
+{
+    return opts->relaunch_argv;
+}
+
 void
 sentry_options_set_environment(sentry_options_t *opts, const char *environment)
 {

src/sentry_options.h

@@ -37,6 +37,7 @@ typedef struct sentry_options_s {
     char *http_proxy;
     char *ca_certs;
     char *transport_thread_name;
+    char *relaunch_argv;
     sentry_path_t *database_path;
     sentry_path_t *handler_path;
     sentry_logger_t logger;