Merge branch 'master' into jpnurmi/feat/last-crash

Author: jpnurmi

.github/docker/alpine/Dockerfile

@@ -2,8 +2,7 @@
 ARG BASE=alpine:latest
 FROM ${BASE}
 
-RUN apk update
-RUN apk add \
+RUN apk add --no-cache \
     bash \
     build-base \
     cargo \
@@ -17,6 +16,9 @@ RUN apk add \
     lsb-release-minimal \
     mitmproxy \
     moreutils \
+    nodejs \
+    npm \
+    openssl-dev \
     perl \
     powershell \
     python3 \

.github/workflows/benchmark.yml

@@ -52,7 +52,7 @@ jobs:
           pip install --upgrade --requirement tests/requirements.txt
           pytest --verbose --benchmark_out=benchmark.json tests/benchmark.py
 
-      - uses: benchmark-action/github-action-benchmark@a60cea5bc7b49e15c1f58f411161f99e0df48372 # pin@v1.22.0
+      - uses: benchmark-action/github-action-benchmark@52576c92bccf6ac60c8223ec7eb2565637cae9ba # pin@v1.22.1
         if: ${{ github.event_name == 'push' }}
         with:
           name: ${{ runner.os }}

.github/workflows/codeql.yml

@@ -30,7 +30,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # pin@v4.35.3
+        uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # pin@v4.35.4
         with:
           languages: ${{ matrix.language }}
 
@@ -64,4 +64,4 @@ jobs:
           cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo && cmake --build build --parallel
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # pin@v4.35.3
+        uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # pin@v4.35.4

.github/workflows/console-check.yml

@@ -65,9 +65,9 @@ jobs:
           REF: ${{ github.ref }}
         run: |
           if [[ "$EVENT_NAME" == "push" && "$REF" == refs/heads/release/* ]]; then
-            echo "mode=FULL_TEST" >> "$GITHUB_OUTPUT"
+            echo "mode=BUILD_ONLY" >> "$GITHUB_OUTPUT"
           elif [[ "$EVENT_NAME" == "push" && "$REF" == "refs/heads/master" ]]; then
-            echo "mode=UNIT_TEST" >> "$GITHUB_OUTPUT"
+            echo "mode=BUILD_ONLY" >> "$GITHUB_OUTPUT"
           else
             echo "mode=BUILD_ONLY" >> "$GITHUB_OUTPUT"
           fi

.github/workflows/docker.yml

@@ -17,6 +17,7 @@ jobs:
       matrix:
         version:
           - '3.21'
+          - '3.23'
 
     permissions:
       contents: read
@@ -34,9 +35,15 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build ${{ env.IMAGE_NAME }}
-        run: docker build --build-arg BASE=alpine:${{ matrix.version }} -t ${{ env.IMAGE_NAME }} .
-        working-directory: .github/docker/alpine
+      - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
 
-      - name: Push ${{ env.IMAGE_NAME }}
-        run: docker push ${{ env.IMAGE_NAME }}
+      - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+
+      - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ env.IMAGE_NAME }}
+          context: .github/docker/alpine
+          build-args: |
+            BASE=alpine:${{ matrix.version }}

CHANGELOG.md

@@ -4,16 +4,32 @@
 
 **Features**:
 
+- Add `sentry_get_last_crash` to allow fetching `event_id` from last crash. ([#1711](https://github.com/getsentry/sentry-native/pull/1711))
+
+## 0.14.2
+
+**Fixes**:
+
+- Protect CMAKE_SYSTEM_VERSION to avoid empty values when cross-building. ([#1720](https://github.com/getsentry/sentry-native/pull/1720))
+
+## 0.14.1
+
+**Features**:
+
+- Add [strict trace continuation](https://develop.sentry.dev/sdk/foundations/trace-propagation/#strict-trace-continuation) via `sentry_options_set_strict_trace_continuation`. ([#1663](https://github.com/getsentry/sentry-native/pull/1663))
 - Auto-populate `event.user.id` with a persistent per-installation UUID when no explicit user ID is set. ([#1661](https://github.com/getsentry/sentry-native/pull/1661))
 - Add cache keep modes, including `SENTRY_CACHE_KEEP_ALWAYS` to cache envelopes regardless of upload result. ([#1707](https://github.com/getsentry/sentry-native/pull/1707))
 - Crashpad: add error log for oversized envelopes (HTTP 413 Content Too Large). ([#1706](https://github.com/getsentry/sentry-native/pull/1706), [crashpad#155](https://github.com/getsentry/crashpad/pull/155))
 - Crashpad: support modifying attachments after `sentry_init` on macOS. ([#1705](https://github.com/getsentry/sentry-native/pull/1705), [crashpad#153](https://github.com/getsentry/crashpad/pull/153))
 - Add `cache_dir` envelope header for external crash reporters. ([#1698](https://github.com/getsentry/sentry-native/pull/1698))
-- Add `sentry_get_last_crash` to allow fetching `event_id` from last crash. ([#1711](https://github.com/getsentry/sentry-native/pull/1711))
+- Add `sentry_attachment_set_type` and `SENTRY_ATTACHMENT_TYPE_*` macros for standard Sentry attachment types. ([#1700](https://github.com/getsentry/sentry-native/pull/1700))
+  - Deprecate `sentry_options_add_view_hierarchy*` in favor of `sentry_attach_file*` with `sentry_attachment_set_type`.
 
 **Fixes**:
 
 - Native/Breakpad/Windows: fixed capturing abort(). ([#1708](https://github.com/getsentry/sentry-native/pull/1708))
+- Native/Windows: capture fast-fail and stack buffer overrun crashes via WER. ([#1710](https://github.com/getsentry/sentry-native/pull/1710))
+- Preserve cached minidump refs. ([#1715](https://github.com/getsentry/sentry-native/pull/1715))
 
 ## 0.14.0
 
@@ -22,6 +38,20 @@
 - Metrics are enabled by default. This behavior first appeared in `0.13.5` and is now documented as part of the `0.14.0` behavior. Applications that do not want to send metrics must explicitly opt out with `sentry_options_set_enable_metrics(options, false)`. ([#1609](https://github.com/getsentry/sentry-native/pull/1609))
 - Structured logs are enabled by default. This behavior first appeared in `0.13.9` and is now documented as part of the `0.14.0` behavior. Applications that do not want to capture structured logs must explicitly opt out with `sentry_options_set_enable_logs(options, false)`. ([#1673](https://github.com/getsentry/sentry-native/pull/1673))
 
+**Fixes**:
+
+- Native/Linux: correct `MD_LINUX_MAPS` stream type (was tagged as `MD_LINUX_AUXV`). ([#1694](https://github.com/getsentry/sentry-native/pull/1694))
+- Native/Linux: drop non-ELF mappings (e.g. `/dev/shm/*`, `(deleted)` files) from the minidump module list. ([#1694](https://github.com/getsentry/sentry-native/pull/1694))
+- Native/Linux: merge non-contiguous mappings of the same shared library into a single module, and use the offset==0 mapping as `base_of_image`. Fixes duplicate `ld-linux` entries that confused some debuggers (notably Windows LLDB) reading Linux ARM64 minidumps. ([#1694](https://github.com/getsentry/sentry-native/pull/1694))
+- Native/Linux: log when `uname()` is blocked (sandbox/seccomp) and fall back to `/proc/sys/kernel/osrelease` for the OS version. ([#1694](https://github.com/getsentry/sentry-native/pull/1694))
+- Native/Linux: emit `LinuxAuxv`, `LinuxCpuInfo`, `LinuxLsbRelease`, `LinuxCmdLine`, `LinuxEnviron`, and `LinuxDsoDebug` streams alongside the existing set, matching what Breakpad writes. LLDB needs `LinuxAuxv` and `LinuxDsoDebug` to identify the dynamic loader and enumerate loaded shared libraries; without them, opening a minidump in LLDB on Linux would only recover one frame per thread. ([#1694](https://github.com/getsentry/sentry-native/pull/1694))
+- Native/Linux: replay each thread's stack memory descriptor into `MemoryListStream`. Previously stack bytes were only referenced from the per-thread record, so debuggers that look up memory by virtual address (LLDB) could not read the stack and unwinding stopped at frame 0 even when `eh_frame` was available. ([#1694](https://github.com/getsentry/sentry-native/pull/1694))
+- Native/macOS: replay each thread's stack memory descriptor into `MemoryListStream` so LLDB can read stack contents (same fix as Linux above). ([#1694](https://github.com/getsentry/sentry-native/pull/1694))
+
+**Features**:
+
+- Native (Linux, macOS): SMART minidump mode now also captures memory referenced by the registers and stack contents of every captured thread, matching the semantics of `MiniDumpWithIndirectlyReferencedMemory` on Windows (already in effect for the native Windows backend). For each pointer that resolves into a writable heap region, ~1 KiB is captured around it; total budget capped at 4 MiB per dump. Heap-allocated structs reachable from the crashing call stack can now be inspected in LLDB / VS Code. ([#1694](https://github.com/getsentry/sentry-native/pull/1694))
+
 ## 0.13.9
 
 **Features**:

CMakeLists.txt

@@ -198,6 +198,29 @@ else()
 	message(FATAL_ERROR "SENTRY_TRANSPORT must be one of: ${_SUPPORTED_TRANSPORTS}")
 endif()
 
+if(WIN32 AND NOT XBOX)
+	set(SENTRY_DEFAULT_SCREENSHOT "windows")
+	set(_SUPPORTED_SCREENSHOTS "windows, none, or custom")
+else()
+	set(SENTRY_DEFAULT_SCREENSHOT "none")
+	set(_SUPPORTED_SCREENSHOTS "none or custom")
+endif()
+
+set(SENTRY_SCREENSHOT ${SENTRY_DEFAULT_SCREENSHOT} CACHE STRING
+	"The screenshot implementation that sentry uses, can be one of: ${_SUPPORTED_SCREENSHOTS}.")
+
+if(SENTRY_SCREENSHOT STREQUAL "windows")
+	if(NOT WIN32 OR XBOX)
+		message(FATAL_ERROR "The windows screenshot implementation is only supported on Windows.")
+	endif()
+	set(SENTRY_SCREENSHOT_WINDOWS TRUE)
+elseif(SENTRY_SCREENSHOT STREQUAL "custom")
+	set(SENTRY_SCREENSHOT_CUSTOM TRUE)
+elseif(SENTRY_SCREENSHOT STREQUAL "none")
+	set(SENTRY_SCREENSHOT_NONE TRUE)
+else()
+	message(FATAL_ERROR "SENTRY_SCREENSHOT must be one of: ${_SUPPORTED_SCREENSHOTS}")
+endif()
 
 if(SENTRY_BUILD_TESTS OR SENTRY_BUILD_EXAMPLES)
 	enable_testing()
@@ -601,8 +624,8 @@ elseif(WIN32)
 	# WaitOnAddress/WakeByAddressSingle require Windows 8+
 	# (Synchronization.lib). Older targets fall back to sleep-poll.
 	if(NOT (MSVC AND CMAKE_GENERATOR_TOOLSET MATCHES "_xp$")
-		AND (${CMAKE_SYSTEM_VERSION} MATCHES "^10"
-			OR ${CMAKE_SYSTEM_VERSION} MATCHES "^6\\.[23]"))
+		AND ("${CMAKE_SYSTEM_VERSION}" MATCHES "^10"
+			OR "${CMAKE_SYSTEM_VERSION}" MATCHES "^6\\.[23]"))
 		list(APPEND _SENTRY_PLATFORM_LIBS "synchronization")
 	endif()
 endif()
@@ -767,6 +790,25 @@ elseif(SENTRY_BACKEND_NATIVE)
 	# Native backend sources and configuration are in src/CMakeLists.txt
 	# The native backend requires C11 for atomics (set in src/CMakeLists.txt)
 
+	if(WIN32 AND NOT XBOX)
+		add_library(sentry-wer SHARED
+			src/backends/native/sentry_wer.c
+			src/backends/native/sentry_wer.def
+		)
+		target_include_directories(sentry-wer PRIVATE
+			${PROJECT_SOURCE_DIR}/include
+			${PROJECT_SOURCE_DIR}/src
+			${PROJECT_SOURCE_DIR}/src/backends/native
+		)
+		target_link_libraries(sentry-wer PRIVATE wer)
+		set_property(TARGET sentry-wer PROPERTY PREFIX "") # ensure MINGW doesn't prefix "lib" to dll name
+		set_property(TARGET sentry-wer PROPERTY DEBUG_POSTFIX "") # prevent CMAKE_DEBUG_POSTFIX from being applied
+		if(SENTRY_BUILD_RUNTIMESTATIC AND MSVC)
+			set_property(TARGET sentry-wer PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		endif()
+		sentry_add_version_resource(sentry-wer "Native WER Module")
+	endif()
+
 	# Build sentry-crash executable for native backend
 	# Get all sources that were added to sentry target
 	get_target_property(SENTRY_SOURCES sentry SOURCES)
@@ -837,11 +879,25 @@ elseif(SENTRY_BACKEND_NATIVE)
 
 	# Make sentry library depend on crash daemon so it's always built together
 	add_dependencies(sentry sentry-crash)
+	if(WIN32 AND NOT XBOX)
+		add_dependencies(sentry sentry-wer)
+	endif()
 
 	# Install daemon
 	install(TARGETS sentry-crash
 		RUNTIME DESTINATION bin
 	)
+	if(WIN32 AND NOT XBOX)
+		install(TARGETS sentry-wer
+			RUNTIME DESTINATION bin
+			LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+			ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		)
+		if(MSVC)
+			sentry_install(FILES $<TARGET_PDB_FILE:sentry-wer>
+				DESTINATION "${CMAKE_INSTALL_BINDIR}" OPTIONAL)
+		endif()
+	endif()
 
 	if(DEFINED SENTRY_FOLDER)
 		# Native backend doesn't have separate targets to organize
@@ -928,6 +984,7 @@ if(SENTRY_BUILD_EXAMPLES)
 
 		# to test handling SEH by-passing exceptions we need to enable the control flow guard
 		target_compile_options(sentry_example PRIVATE $<BUILD_INTERFACE:/guard:cf>)
+		target_link_options(sentry_example PRIVATE $<BUILD_INTERFACE:/GUARD:CF>)
 	else()
 		# Disable all optimizations for the `sentry_example` in gcc/clang. This allows us to keep crash triggers simple.
 		# The effects besides reproducible code-gen across compiler versions, will be negligible for build- and runtime.

examples/example.c

@@ -600,6 +600,14 @@ main(int argc, char **argv)
         sentry_options_set_traces_sample_rate(options, 1.0);
     }
 
+    if (has_arg(argc, argv, "org-id")) {
+        sentry_options_set_org_id(options, "123456");
+    }
+
+    if (has_arg(argc, argv, "strict-trace-continuation")) {
+        sentry_options_set_strict_trace_continuation(options, 1);
+    }
+
     if (has_arg(argc, argv, "child-spans")) {
         sentry_options_set_max_spans(options, 5);
     }
@@ -683,12 +691,6 @@ main(int argc, char **argv)
         sentry_options_set_crashpad_wait_for_upload(options, true);
     }
 
-    if (has_arg(argc, argv, "attach-view-hierarchy")) {
-        // assuming the example / test is run directly from the cmake build
-        // directory
-        sentry_options_add_view_hierarchy(options, "./view-hierarchy.json");
-    }
-
     if (has_arg(argc, argv, "test-logger")) {
         // Set up the test logger for integration tests
         sentry_options_set_logger(options, test_logger_callback, NULL);
@@ -862,6 +864,14 @@ main(int argc, char **argv)
             = sentry_attach_bytes("\xc0\xff\xee", 3, "bytes.bin");
         sentry_attachment_set_content_type(bytes, "application/octet-stream");
     }
+    if (has_arg(argc, argv, "attach-view-hierarchy")) {
+        // assuming the example / test is run directly from the cmake build
+        // directory
+        sentry_attachment_t *view_hierarchy
+            = sentry_attach_file("./view-hierarchy.json");
+        sentry_attachment_set_type(
+            view_hierarchy, SENTRY_ATTACHMENT_TYPE_VIEW_HIERARCHY);
+    }
 
     if (sentry_options_get_enable_logs(options)) {
         if (has_arg(argc, argv, "capture-log")) {
@@ -1168,6 +1178,20 @@ main(int argc, char **argv)
             sentry_transaction_context_update_from_header(
                 tx_ctx, "sentry-trace", trace_header);
         }
+        if (has_arg(argc, argv, "incoming-trace")) {
+            sentry_transaction_context_update_from_header(tx_ctx,
+                "sentry-trace",
+                "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-1");
+        }
+        if (has_arg(argc, argv, "incoming-baggage")) {
+            sentry_transaction_context_update_from_header(tx_ctx, "baggage",
+                "sentry-org_id=123456,sentry-environment=upstream,"
+                "sentry-release=upstream-app%401.0");
+        }
+        if (has_arg(argc, argv, "incoming-baggage-mismatch")) {
+            sentry_transaction_context_update_from_header(tx_ctx, "baggage",
+                "sentry-org_id=99999,sentry-environment=upstream");
+        }
 
         sentry_transaction_t *tx
             = sentry_transaction_start(tx_ctx, custom_sampling_ctx);