thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Settings for crash report opt-in

Browse Source
This commit is contained in:
Ivan Blinkov 2020-05-27 23:15:33 +03:00
parent 709b4f42c8
commit 31123236cb
4 changed files with 105 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/daemon/BaseDaemon.cpp
View File

@ -514,7 +514,6 @@ void debugIncreaseOOMScore() {}
void BaseDaemon::initialize(Application & self)
{
closeFDs();
SentryWriter::initialize();
task_manager = std::make_unique<Poco::TaskManager>();
ServerApplication::initialize(self);
@ -533,6 +532,7 @@ void BaseDaemon::initialize(Application & self)
}
reloadConfiguration();
SentryWriter::initialize(config());
/// This must be done before creation of any files (including logs).
mode_t umask_num = 0027;

164
base/daemon/SentryWriter.cpp
View File

@ -1,14 +1,21 @@
#include <daemon/SentryWriter.h>
#include <Common/config.h>
#include <common/getFQDNOrHostName.h>
#if !defined(ARCADIA_BUILD)
# include "Common/config_version.h"
#endif
#if USE_SENTRY
#include <sentry.h>
#endif
namespace {
static bool initialized = false;
void setExtras() {
#if USE_SENTRY
sentry_set_extra("version_githash", sentry_value_new_string(VERSION_GITHASH));
sentry_set_extra("version_describe", sentry_value_new_string(VERSION_DESCRIBE));
sentry_set_extra("version_integer", sentry_value_new_int32(VERSION_INTEGER));
@ -16,24 +23,47 @@ namespace {
sentry_set_extra("version_major", sentry_value_new_int32(VERSION_MAJOR));
sentry_set_extra("version_minor", sentry_value_new_int32(VERSION_MINOR));
sentry_set_extra("version_patch", sentry_value_new_int32(VERSION_PATCH));
#endif
}
}
void SentryWriter::initialize() {
sentry_options_t * options = sentry_options_new();
sentry_options_set_release(options, VERSION_STRING);
sentry_options_set_debug(options, 1);
sentry_init(options);
sentry_options_set_dsn(options, "https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277");
if (strstr(VERSION_DESCRIBE, "-stable") || strstr(VERSION_DESCRIBE, "-lts")) {
sentry_options_set_environment(options, "prod");
} else {
sentry_options_set_environment(options, "test");
void SentryWriter::initialize(Poco::Util::LayeredConfiguration & config) {
#if USE_SENTRY
bool enabled = false;
if (config.getBool("send_crash_reports.enabled", false))
{
if ((strlen(VERSION_OFFICIAL) > 0) || config.getBool("send_crash_reports.debug", false))
{
enabled = true;
}
}
if (enabled)
{
const std::string & endpoint = config.getString(
"send_crash_reports.endpoint",
"https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277"
);
sentry_options_t * options = sentry_options_new();
sentry_options_set_release(options, VERSION_STRING);
sentry_options_set_debug(options, 1);
sentry_init(options);
sentry_options_set_dsn(options, endpoint.c_str());
if (strstr(VERSION_DESCRIBE, "-stable") || strstr(VERSION_DESCRIBE, "-lts")) {
sentry_options_set_environment(options, "prod");
} else {
sentry_options_set_environment(options, "test");
}
initialized = true;
}
#endif
}
void SentryWriter::shutdown() {
sentry_shutdown();
#if USE_SENTRY
if (initialized) {
sentry_shutdown();
}
#endif
}
void SentryWriter::onFault(
@ -43,65 +73,71 @@ void SentryWriter::onFault(
const StackTrace & stack_trace
)
{
const std::string & error_message = signalToErrorMessage(sig, info, context);
sentry_value_t event = sentry_value_new_message_event(SENTRY_LEVEL_FATAL, "fault", error_message.c_str());
sentry_set_tag("signal", strsignal(sig));
sentry_set_tag("server_name", getFQDNOrHostName().c_str());
sentry_set_extra("signal_number", sentry_value_new_int32(sig));
setExtras();
sentry_value_t frames = sentry_value_new_list();
size_t stack_size = stack_trace.getSize();
if (stack_size > 0)
#if USE_SENTRY
if (initialized)
{
size_t offset = stack_trace.getOffset();
if (stack_size == 1)
const std::string & error_message = signalToErrorMessage(sig, info, context);
sentry_value_t event = sentry_value_new_message_event(SENTRY_LEVEL_FATAL, "fault", error_message.c_str());
sentry_set_tag("signal", strsignal(sig));
sentry_set_tag("server_name", getFQDNOrHostName().c_str());
sentry_set_extra("signal_number", sentry_value_new_int32(sig));
setExtras();
/// Prepare data for https://develop.sentry.dev/sdk/event-payloads/stacktrace/
sentry_value_t frames = sentry_value_new_list();
size_t stack_size = stack_trace.getSize();
if (stack_size > 0)
{
offset = 1;
size_t offset = stack_trace.getOffset();
if (stack_size == 1)
{
offset = 1;
}
char instruction_addr[100];
for (size_t i = stack_size - 1; i >= offset; --i)
{
const StackTrace::Frame & current_frame = stack_trace.getFrames().value()[i];
sentry_value_t frame = sentry_value_new_object();
unsigned long long frame_ptr = reinterpret_cast<unsigned long long>(current_frame.virtual_addr);
snprintf(instruction_addr, sizeof(instruction_addr), "0x%llx", frame_ptr);
sentry_value_set_by_key(frame, "instruction_addr", sentry_value_new_string(instruction_addr));
if (current_frame.symbol.has_value())
{
sentry_value_set_by_key(frame, "function", sentry_value_new_string(current_frame.symbol.value().c_str()));
}
if (current_frame.file.has_value())
{
sentry_value_set_by_key(frame, "filename", sentry_value_new_string(current_frame.file.value().c_str()));
}
if (current_frame.line.has_value())
{
sentry_value_set_by_key(frame, "lineno", sentry_value_new_int32(current_frame.line.value()));
}
sentry_value_append(frames, frame);
}
}
char instruction_addr[100];
for (size_t i = stack_size - 1; i >= offset; --i)
{
const StackTrace::Frame & current_frame = stack_trace.getFrames().value()[i];
sentry_value_t frame = sentry_value_new_object();
unsigned long long frame_ptr = reinterpret_cast<unsigned long long>(current_frame.virtual_addr);
snprintf(instruction_addr, sizeof(instruction_addr), "0x%llx", frame_ptr);
sentry_value_set_by_key(frame, "instruction_addr", sentry_value_new_string(instruction_addr));
if (current_frame.symbol.has_value())
{
sentry_value_set_by_key(frame, "function", sentry_value_new_string(current_frame.symbol.value().c_str()));
}
/// Prepare data for https://develop.sentry.dev/sdk/event-payloads/threads/
sentry_value_t stacktrace = sentry_value_new_object();
sentry_value_set_by_key(stacktrace, "frames", frames);
if (current_frame.file.has_value())
{
sentry_value_set_by_key(frame, "filename", sentry_value_new_string(current_frame.file.value().c_str()));
}
sentry_value_t thread = sentry_value_new_object();
sentry_value_set_by_key(thread, "stacktrace", stacktrace);
if (current_frame.line.has_value())
{
sentry_value_set_by_key(frame, "lineno", sentry_value_new_int32(current_frame.line.value()));
}
sentry_value_t values = sentry_value_new_list();
sentry_value_append(values, thread);
sentry_value_append(frames, frame);
}
sentry_value_t threads = sentry_value_new_object();
sentry_value_set_by_key(threads, "values", values);
sentry_value_set_by_key(event, "threads", threads);
sentry_capture_event(event);
shutdown();
}
sentry_value_t stacktrace = sentry_value_new_object();
sentry_value_set_by_key(stacktrace, "frames", frames);
sentry_value_t thread = sentry_value_new_object();
sentry_value_set_by_key(thread, "stacktrace", stacktrace);
sentry_value_t values = sentry_value_new_list();
sentry_value_append(values, thread);
sentry_value_t threads = sentry_value_new_object();
sentry_value_set_by_key(threads, "values", values);
sentry_value_set_by_key(event, "threads", threads);
sentry_capture_event(event);
shutdown();
#endif
}

4
base/daemon/SentryWriter.h
View File

@ -3,6 +3,8 @@
#include <common/types.h>
#include <Common/StackTrace.h>
#include <Poco/Util/LayeredConfiguration.h>
#include <string>
class SentryWriter
@ -10,7 +12,7 @@ class SentryWriter
public:
SentryWriter() = delete;
static void initialize();
static void initialize(Poco::Util::LayeredConfiguration & config);
static void shutdown();
static void onFault(
int sig,

1
src/Common/config.h.in
View File

@ -9,4 +9,5 @@
#cmakedefine01 USE_BROTLI
#cmakedefine01 USE_UNWIND
#cmakedefine01 USE_OPENCL
#cmakedefine01 USE_SENTRY
#cmakedefine01 CLICKHOUSE_SPLIT_BINARY