fix: Include screenshot attachment in native backend envelope (#1624)

* fix: Include screenshot attachment in native backend envelope

* Update changelog

* Add scrrenshot options check

* Enable native backend screenshot test

* Revert test

* Update skip reason comment

Author: tustanivsky

CHANGELOG.md

@@ -12,6 +12,7 @@
 
 - native: Fix crash daemon failing to detect crashes during OOM on Windows. ([#1603](https://github.com/getsentry/sentry-native/issues/1603))
 - Fix `WinHttpReceiveResponse` failures being silently ignored, which could cause envelopes to be lost instead of retried or cached. ([#1620](https://github.com/getsentry/sentry-native/pull/1620))
+- Fix missing screenshot attachment in native backend envelope ([#1624](https://github.com/getsentry/sentry-native/pull/1624))
 
 ## 0.13.4
 

src/backends/native/sentry_crash_daemon.c

@@ -2391,6 +2391,17 @@ write_envelope_with_native_stacktrace(const sentry_options_t *options,
         }
     }
 
+    // Add screenshot attachment if captured by the daemon
+    if (options && options->attach_screenshot && run_folder) {
+        sentry_path_t *screenshot_path
+            = sentry__path_join_str(run_folder, "screenshot.png");
+        if (screenshot_path) {
+            write_attachment_to_envelope(
+                fd, screenshot_path->path, "screenshot.png", "image/png");
+            sentry__path_free(screenshot_path);
+        }
+    }
+
 #if defined(SENTRY_PLATFORM_UNIX)
     close(fd);
 #elif defined(SENTRY_PLATFORM_WINDOWS)
@@ -2614,6 +2625,17 @@ write_envelope_with_minidump(const sentry_options_t *options,
         }
     }
 
+    // Add screenshot attachment if captured by the daemon
+    if (options && options->attach_screenshot && run_folder) {
+        sentry_path_t *screenshot_path
+            = sentry__path_join_str(run_folder, "screenshot.png");
+        if (screenshot_path) {
+            write_attachment_to_envelope(
+                fd, screenshot_path->path, "screenshot.png", "image/png");
+            sentry__path_free(screenshot_path);
+        }
+    }
+
 #if defined(SENTRY_PLATFORM_UNIX)
     close(fd);
 #elif defined(SENTRY_PLATFORM_WINDOWS)

tests/test_integration_screenshot.py

@@ -43,7 +43,8 @@ def assert_screenshot_upload(req):
         pytest.param(
             {"SENTRY_BACKEND": "native"},
             marks=pytest.mark.skip(
-                reason="Native backend screenshot needs testing on Windows machine"
+                reason="Native daemon cleans up run folder after processing "
+                "so the screenshot file is no longer on disk"
             ),
         ),
     ],