ref(crashpad): pass predefined report ID (#1488)

Author: jpnurmi

external/crashpad

@@ -539,6 +539,9 @@ crashpad_backend_startup(
 
     std::vector<std::string> arguments { "--no-rate-limit" };
 
+    char report_id[37];
+    sentry_uuid_as_string(&data->crash_event_id, report_id);
+
     // Initialize database first, flushing the consent later on as part of
     // `sentry_init` will persist the upload flag.
     data->db = crashpad::CrashReportDatabase::Initialize(database).release();
@@ -564,7 +567,8 @@ crashpad_backend_startup(
         minidump_url ? minidump_url : "", proxy_url, annotations, arguments,
         /* restartable */ true,
         /* asynchronous_start */ false, attachments, screenshot,
-        options->crashpad_wait_for_upload, crash_reporter, crash_envelope);
+        options->crashpad_wait_for_upload, crash_reporter, crash_envelope,
+        report_id);
     sentry_free(minidump_url);
 
 #ifdef SENTRY_PLATFORM_WINDOWS

src/backends/sentry_backend_crashpad.cpp

@@ -475,6 +475,7 @@ def assert_crashpad_upload(req, expect_attachment=False, expect_view_hierarchy=F
         and b"\n\nMDMP" in part.as_bytes()
         for part in msg.walk()
     )
+    return attachments
 
 
 def assert_gzip_file_header(output):

tests/assertions.py

@@ -410,11 +410,14 @@ def test_crashpad_dumping_crash(cmake, httpserver, run_args, build_args):
 
     envelope = Envelope.deserialize(session)
     assert_session(envelope, {"status": "crashed", "errors": 1})
-    assert_crashpad_upload(
+    attachments = assert_crashpad_upload(
         multipart,
         expect_attachment="clear-attachments" not in run_args,
         expect_view_hierarchy="clear-attachments" not in run_args,
     )
+    event_id = attachments.event["event_id"]
+    minidump = tmp_path / ".sentry-native" / "completed" / f"{event_id}.dmp"
+    assert minidump.exists()
 
 
 @pytest.mark.parametrize(