Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ sentry_target_sources_cwd(sentry
sentry_symbolizer.h
sentry_sync.c
sentry_sync.h
sentry_telemetry.c
sentry_telemetry.h
sentry_thread_stackwalk.h
sentry_transport.c
sentry_transport.h
Expand Down
33 changes: 8 additions & 25 deletions src/backends/sentry_backend_breakpad.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ extern "C" {
#include "sentry_database.h"
#include "sentry_envelope.h"
#include "sentry_logger.h"
#include "sentry_logs.h"
#include "sentry_metrics.h"
#include "sentry_options.h"
#ifdef SENTRY_PLATFORM_WINDOWS
# include "sentry_os.h"
Expand All @@ -20,10 +18,10 @@ extern "C" {
#include "sentry_session_replay.h"
#include "sentry_string.h"
#include "sentry_sync.h"
#include "sentry_telemetry.h"
#include "sentry_tracing.h"
#include "sentry_transport.h"
#include "sentry_unix_pageallocator.h"
#include "transports/sentry_disk_transport.h"
}

#ifdef __GNUC__
Expand Down Expand Up @@ -167,13 +165,10 @@ breakpad_backend_callback(const google_breakpad::MinidumpDescriptor &descriptor,
should_handle = !sentry_value_is_null(result);
}

sentry__transport_suspend(options->transport);

// Flush logs and metrics in a crash-safe manner before crash handling
if (options->enable_logs) {
sentry__logs_flush_crash_safe();
}
if (options->enable_metrics) {
sentry__metrics_flush_crash_safe();
}
sentry__telemetry_flush_crash_safe();

if (should_handle) {
bool capture_screenshot = options->attach_screenshot;
Expand Down Expand Up @@ -246,33 +241,21 @@ breakpad_backend_callback(const google_breakpad::MinidumpDescriptor &descriptor,
if (envelope && sentry__session_replay_has_pending(options)) {
sentry_value_t crash_event
= sentry_envelope_get_event(envelope);
sentry_transport_t *replay_transport
= sentry_new_disk_transport(options->run);
if (replay_transport) {
sentry__session_replay_flush_pending(
options, replay_transport, crash_event);
sentry__transport_dump_queue(
replay_transport, options->run);
sentry_transport_free(replay_transport);
}
sentry__session_replay_flush_pending(
options, options->transport, crash_event);
}

if (!sentry__launch_external_crash_reporter(options, envelope)) {
// capture the envelopes with the disk transport
sentry_transport_t *disk_transport
= sentry_new_disk_transport(options->run);
if (!sentry_value_is_null(transaction)) {
sentry_envelope_t *tx_envelope
= sentry__prepare_transaction(
options, transaction, nullptr);
if (tx_envelope) {
sentry__capture_envelope(
disk_transport, tx_envelope, options);
options->transport, tx_envelope, options);
}
}
sentry__capture_envelope(disk_transport, envelope, options);
sentry__transport_dump_queue(disk_transport, options->run);
sentry_transport_free(disk_transport);
sentry__capture_envelope(options->transport, envelope, options);
Comment thread
cursor[bot] marked this conversation as resolved.
} else {
sentry_value_decref(transaction);
}
Expand Down
32 changes: 7 additions & 25 deletions src/backends/sentry_backend_crashpad.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ extern "C" {
#include "sentry_database.h"
#include "sentry_envelope.h"
#include "sentry_logger.h"
#include "sentry_logs.h"
#include "sentry_metrics.h"
#include "sentry_options.h"
#ifdef SENTRY_PLATFORM_WINDOWS
# include "sentry_os.h"
Expand All @@ -19,14 +17,14 @@ extern "C" {
#include "sentry_screenshot.h"
#include "sentry_session_replay.h"
#include "sentry_sync.h"
#include "sentry_telemetry.h"
#include "sentry_transport.h"
#include "sentry_value.h"
#ifdef SENTRY_PLATFORM_LINUX
# include "sentry_unix_pageallocator.h"
#endif
#include "sentry_utils.h"
#include "sentry_uuid.h"
#include "transports/sentry_disk_transport.h"
}

#include <map>
Expand Down Expand Up @@ -440,13 +438,10 @@ crashpad_handler(int signum, siginfo_t *info, ucontext_t *user_context)
crash_event, nullptr, options->before_send_data);
}

sentry__transport_suspend(options->transport);

// Flush logs and metrics in a crash-safe manner before crash handling
if (options->enable_logs) {
sentry__logs_flush_crash_safe();
}
if (options->enable_metrics) {
sentry__metrics_flush_crash_safe();
}
sentry__telemetry_flush_crash_safe();

should_dump = !sentry_value_is_null(crash_event);

Expand All @@ -461,13 +456,7 @@ crashpad_handler(int signum, siginfo_t *info, ucontext_t *user_context)
if (session) {
sentry_envelope_t *envelope = sentry__envelope_new();
sentry__envelope_add_session(envelope, session);

// capture the envelope with the disk transport
sentry_transport_t *disk_transport
= sentry_new_disk_transport(options->run);
sentry__capture_envelope(disk_transport, envelope, options);
sentry__transport_dump_queue(disk_transport, options->run);
sentry_transport_free(disk_transport);
sentry__capture_envelope(options->transport, envelope, options);
}

if (sentry__session_replay_has_pending(options)) {
Expand All @@ -480,15 +469,8 @@ crashpad_handler(int signum, siginfo_t *info, ucontext_t *user_context)
sentry__ringbuffer_to_list(scope->breadcrumbs));
}

sentry_transport_t *replay_transport
= sentry_new_disk_transport(options->run);
if (replay_transport) {
sentry__session_replay_flush_pending(
options, replay_transport, crash_event);
sentry__transport_dump_queue(
replay_transport, options->run);
sentry_transport_free(replay_transport);
}
sentry__session_replay_flush_pending(
options, options->transport, crash_event);
}
sentry_value_decref(crash_event);
} else {
Expand Down
33 changes: 8 additions & 25 deletions src/backends/sentry_backend_inproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
#include "sentry_database.h"
#include "sentry_envelope.h"
#include "sentry_logger.h"
#include "sentry_logs.h"
#include "sentry_metrics.h"
#include "sentry_options.h"
#if defined(SENTRY_PLATFORM_WINDOWS)
# include "sentry_os.h"
Expand All @@ -18,10 +16,10 @@
#include "sentry_screenshot.h"
#include "sentry_session_replay.h"
#include "sentry_sync.h"
#include "sentry_telemetry.h"
#include "sentry_tracing.h"
#include "sentry_transport.h"
#include "sentry_unix_pageallocator.h"
#include "transports/sentry_disk_transport.h"
#include <errno.h>
#include <limits.h>
#ifdef SENTRY_PLATFORM_UNIX
Expand Down Expand Up @@ -1127,13 +1125,10 @@ process_ucontext_deferred(const sentry_ucontext_t *uctx,
SENTRY_DEBUG("skipping `on_crash` hook due to recursive crash");
}

sentry__transport_suspend(options->transport);

Comment thread
cursor[bot] marked this conversation as resolved.
// Flush logs in a crash-safe manner before crash handling
if (options->enable_logs) {
sentry__logs_flush_crash_safe();
}
if (options->enable_metrics) {
sentry__metrics_flush_crash_safe();
}
sentry__telemetry_flush_crash_safe();
TEST_CRASH_POINT("before_capture");
if (should_handle) {
bool capture_screenshot = options->attach_screenshot;
Expand Down Expand Up @@ -1176,33 +1171,21 @@ process_ucontext_deferred(const sentry_ucontext_t *uctx,
if (envelope && sentry__session_replay_has_pending(options)) {
sentry_value_t crash_event
= sentry_envelope_get_event(envelope);
sentry_transport_t *replay_transport
= sentry_new_disk_transport(options->run);
if (replay_transport) {
sentry__session_replay_flush_pending(
options, replay_transport, crash_event);
sentry__transport_dump_queue(
replay_transport, options->run);
sentry_transport_free(replay_transport);
}
sentry__session_replay_flush_pending(
options, options->transport, crash_event);
}

if (!sentry__launch_external_crash_reporter(options, envelope)) {
// capture the envelopes with the disk transport
sentry_transport_t *disk_transport
= sentry_new_disk_transport(options->run);
if (!sentry_value_is_null(transaction)) {
sentry_envelope_t *tx_envelope
= sentry__prepare_transaction(
options, transaction, NULL);
if (tx_envelope) {
sentry__capture_envelope(
disk_transport, tx_envelope, options);
options->transport, tx_envelope, options);
}
}
sentry__capture_envelope(disk_transport, envelope, options);
sentry__transport_dump_queue(disk_transport, options->run);
sentry_transport_free(disk_transport);
sentry__capture_envelope(options->transport, envelope, options);
} else {
sentry_value_decref(transaction);
}
Expand Down
51 changes: 18 additions & 33 deletions src/backends/sentry_backend_native.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,17 @@
#include "sentry_envelope.h"
#include "sentry_json.h"
#include "sentry_logger.h"
#include "sentry_logs.h"
#include "sentry_metrics.h"
#include "sentry_options.h"
#include "sentry_os.h"
#include "sentry_path.h"

#include "sentry_scope.h"
#include "sentry_session.h"
#include "sentry_sync.h"
#include "sentry_telemetry.h"
#include "sentry_tracing.h"
#include "sentry_transport.h"
#include "sentry_value.h"
#include "transports/sentry_disk_transport.h"

// Global process-wide synchronization for IPC and shared memory access
// This lives for the entire backend lifetime and is shared across all threads
Expand Down Expand Up @@ -977,13 +975,10 @@ native_backend_except(sentry_backend_t *backend, const sentry_ucontext_t *uctx)

SENTRY_DEBUG("handling native backend exception");

sentry__transport_suspend(options->transport);

// Flush logs and metrics in a crash-safe manner before crash handling
if (options->enable_logs) {
sentry__logs_flush_crash_safe();
}
if (options->enable_metrics) {
sentry__metrics_flush_crash_safe();
}
sentry__telemetry_flush_crash_safe();

// Write crash marker
sentry__write_crash_marker(options);
Expand Down Expand Up @@ -1075,32 +1070,22 @@ native_backend_except(sentry_backend_t *backend, const sentry_ucontext_t *uctx)
SENTRY_SESSION_STATUS_CRASHED);

if (session || !sentry_value_is_null(transaction)) {
sentry_transport_t *disk_transport
= sentry_new_disk_transport(options->run);
if (disk_transport) {
if (!sentry_value_is_null(transaction)) {
sentry_envelope_t *tx_envelope
= sentry__prepare_transaction(
options, transaction, NULL);
if (tx_envelope) {
sentry__capture_envelope(
disk_transport, tx_envelope, options);
}
if (!sentry_value_is_null(transaction)) {
sentry_envelope_t *tx_envelope
= sentry__prepare_transaction(
options, transaction, NULL);
if (tx_envelope) {
sentry__capture_envelope(
options->transport, tx_envelope, options);
}
if (session) {
sentry_envelope_t *envelope
= sentry__envelope_new();
if (envelope) {
sentry__envelope_add_session(envelope, session);
sentry__capture_envelope(
disk_transport, envelope, options);
}
}
if (session) {
sentry_envelope_t *envelope = sentry__envelope_new();
if (envelope) {
sentry__envelope_add_session(envelope, session);
sentry__capture_envelope(
options->transport, envelope, options);
}
sentry__transport_dump_queue(
disk_transport, options->run);
sentry_transport_free(disk_transport);
} else {
sentry_value_decref(transaction);
}
}

Expand Down
Loading
Loading