Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: expose function to send minidumps #1067

Merged
merged 27 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d6e922d
feat: programmatic minidump capture
Oct 11, 2024
a84fd99
fixed compile errors
PlasmaDev5 Oct 11, 2024
2a3c943
Rework of programmatic minidumps based on feedback
Oct 14, 2024
081a05c
Remove unused parameters
Oct 14, 2024
c141201
Address Lint errors
PlasmaDev5 Oct 14, 2024
ac83d5b
Address more review feedback
PlasmaDev5 Oct 15, 2024
39c0bfd
Address Lint errors
PlasmaDev5 Oct 15, 2024
6b25152
Address more lint errors
PlasmaDev5 Oct 15, 2024
1f42aaa
changed from bool to int due to undefined errors
PlasmaDev5 Oct 15, 2024
8233951
Address review feedback
PlasmaDev5 Oct 16, 2024
ed51a88
Work on addressing feedback, example and test
PlasmaDev5 Oct 23, 2024
93b2984
Fixes to lint errors
PlasmaDev5 Oct 23, 2024
293a353
Apply comment suggestion
PlasmaDev5 Oct 23, 2024
5878abc
Add empty line to file end
PlasmaDev5 Oct 23, 2024
6170d7d
use parameter directly
PlasmaDev5 Oct 23, 2024
f240fbb
Merge branch 'master' into feat/programatic_minidump_capture
vaind Oct 31, 2024
0f1c8b6
chore: fix changelog
vaind Oct 31, 2024
67bd3af
add capture_minidump_n
vaind Oct 31, 2024
7e56ee4
feat: capture minidump from path
vaind Oct 31, 2024
4195343
chore: update changelog
vaind Oct 31, 2024
cd75387
cleanup
vaind Oct 31, 2024
a57f849
linter issues
vaind Nov 1, 2024
4fcf4c7
Merge branch 'master' into feat/programatic_minidump_capture2
vaind Nov 1, 2024
fd97f0c
cleanup, review changes, docs
vaind Nov 3, 2024
abbf110
chore: fixup doc
vaind Nov 3, 2024
22eeb6c
Merge branch 'master' into feat/programatic_minidump_capture2
vaind Nov 4, 2024
40ec96e
Update CHANGELOG.md
vaind Nov 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unrelaased

**Features**:

- Add `sentry_capture_minidump()` to capture independently created minidumps ([#1067](https://github.com/getsentry/sentry-native/pull/1067))

## 0.7.11

**Fixes**:
Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,9 @@ if(SENTRY_BUILD_EXAMPLES)
set_target_properties(sentry_example PROPERTIES FOLDER ${SENTRY_FOLDER})
endif()

add_custom_command(TARGET sentry_example POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/tests/fixtures/minidump.dmp" "$<TARGET_FILE_DIR:sentry_example>/minidump.dmp")

add_test(NAME sentry_example COMMAND sentry_example)
endif()

Expand Down
4 changes: 4 additions & 0 deletions examples/example.c
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,10 @@ main(int argc, char **argv)
sentry_transaction_finish(tx);
}

if (has_arg(argc, argv, "capture-minidump")) {
sentry_capture_minidump("minidump.dmp");
}

// make sure everything flushes
sentry_close();

Expand Down
6 changes: 6 additions & 0 deletions include/sentry.h
Original file line number Diff line number Diff line change
Expand Up @@ -1362,6 +1362,12 @@ SENTRY_API sentry_user_consent_t sentry_user_consent_get(void);
*/
SENTRY_API sentry_uuid_t sentry_capture_event(sentry_value_t event);

/**
* Allows capturing independently created minidumps.
vaind marked this conversation as resolved.
Show resolved Hide resolved
*/
SENTRY_API void sentry_capture_minidump(const char *path);
SENTRY_API void sentry_capture_minidump_n(const char *path, size_t path_len);

/**
* Captures an exception to be handled by the backend.
*
Expand Down
54 changes: 54 additions & 0 deletions src/sentry_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "sentry_tracing.h"
#include "sentry_transport.h"
#include "sentry_value.h"
#include "transports/sentry_disk_transport.h"
vaind marked this conversation as resolved.
Show resolved Hide resolved

#ifdef SENTRY_INTEGRATION_QT
# include "integrations/sentry_integration_qt.h"
Expand Down Expand Up @@ -1174,3 +1175,56 @@ sentry_clear_crashed_last_run(void)
sentry__options_unlock();
return success ? 0 : 1;
}

void
sentry_capture_minidump(const char *path)
{
sentry_capture_minidump_n(path, sentry__guarded_strlen(path));
}

void
sentry_capture_minidump_n(const char *path, size_t path_len)
{
sentry_path_t *dump_path = sentry__path_from_str_n(path, path_len);

if (!dump_path) {
SENTRY_WARN(
"sentry_capture_minidump() failed due to null path to minidump");
return;
}

SENTRY_DEBUGF(
"Capturing minidump \"%" SENTRY_PATH_PRI "\"", dump_path->path);

sentry_value_t event = sentry_value_new_event();
sentry_value_set_by_key(
event, "level", sentry__value_new_level(SENTRY_LEVEL_FATAL));

SENTRY_WITH_OPTIONS (options) {
sentry_envelope_t *envelope
= sentry__prepare_event(options, event, NULL, true);

// the minidump is added as an attachment, with type `event.minidump`
sentry_envelope_item_t *item
= sentry__envelope_add_from_path(envelope, dump_path, "attachment");
if (item) {
sentry__envelope_item_set_header(item, "attachment_type",
sentry_value_new_string("event.minidump"));

sentry__envelope_item_set_header(item, "filename",
#ifdef SENTRY_PLATFORM_WINDOWS
sentry__value_new_string_from_wstr(
#else
sentry_value_new_string(
#endif
sentry__path_filename(dump_path)));
}

sentry__capture_envelope(options->transport, envelope);
}

SENTRY_DEBUGF("Minidump has been captured: \"%" SENTRY_PATH_PRI "\"",
dump_path->path);

sentry__path_free(dump_path);
}
Binary file added tests/fixtures/minidump.dmp
Binary file not shown.
52 changes: 52 additions & 0 deletions tests/test_capture_minidump.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import os
import shutil

import pytest

from . import make_dsn, run, Envelope
from .assertions import (
assert_attachment,
assert_breadcrumb,
assert_minidump,
)
from .conditions import has_http

pytestmark = pytest.mark.skipif(not has_http, reason="tests need http")

# fmt: off
auth_header = (
"Sentry sentry_key=uiaeosnrtdy, sentry_version=7, sentry_client=sentry.native/0.7.11"
)
# fmt: on


def test_capture_minidump(cmake, httpserver):
vaind marked this conversation as resolved.
Show resolved Hide resolved
tmp_path = cmake(["sentry_example"], {"SENTRY_BACKEND": "none"})

# make sure we are isolated from previous runs
shutil.rmtree(tmp_path / ".sentry-native", ignore_errors=True)

httpserver.expect_oneshot_request(
"/api/123456/envelope/",
headers={"x-sentry-auth": auth_header},
).respond_with_data("OK")

run(
tmp_path,
"sentry_example",
["log", "attachment", "capture-minidump"],
check=True,
env=dict(os.environ, SENTRY_DSN=make_dsn(httpserver)),
)

assert len(httpserver.log) == 1

req = httpserver.log[0][0]
body = req.get_data()

envelope = Envelope.deserialize(body)

assert_breadcrumb(envelope)
assert_attachment(envelope)

assert_minidump(envelope)
Loading