archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-23 04:50:22 +00:00
Code Issues Projects Releases Wiki Activity

Use semver releases with sentry. ()

Browse source 
Semver does not have the concept of a tweak
field. To address this, we just drop the major
field which has not changed in ages. We can
simply ignore/drop old sentry releases if/when
we perform any major releases.
This commit is contained in:
vkalintiris 2024-05-31 15:47:53 +03:00 • committed by GitHub
parent 0a2459f208
commit b7ec9126c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 10 deletions
packaging
build-package.sh
cmake
Modules
NetdataSentry.cmake
config.cmake.h.in
src/daemon/sentry-native
sentry-native.c

4
packaging/build-package.sh
View file

@ -84,10 +84,6 @@ if [ "${ENABLE_SENTRY}" = "true" ]; then
add_cmake_option NETDATA_SENTRY_ENVIRONMENT "${RELEASE_PIPELINE:-Unknown}" add_cmake_option NETDATA_SENTRY_ENVIRONMENT "${RELEASE_PIPELINE:-Unknown}"
add_cmake_option NETDATA_SENTRY_DIST "${BUILD_DESTINATION:-Unknown}" add_cmake_option NETDATA_SENTRY_DIST "${BUILD_DESTINATION:-Unknown}"
add_cmake_option NETDATA_SENTRY_DSN "${SENTRY_DSN}" add_cmake_option NETDATA_SENTRY_DSN "${SENTRY_DSN}"
if [ -n "${VERSION}" ]; then
add_cmake_option NETDATA_SENTRY_RELEASE "${VERSION}"
fi
else else
add_cmake_option ENABLE_SENTRY Off add_cmake_option ENABLE_SENTRY Off
fi fi

4
packaging/cmake/Modules/NetdataSentry.cmake
View file

@ -20,10 +20,6 @@ function(netdata_bundle_sentry)
set(SENTRY_BACKEND "breakpad") set(SENTRY_BACKEND "breakpad")
set(SENTRY_BUILD_SHARED_LIBS OFF) set(SENTRY_BUILD_SHARED_LIBS OFF)
if(NOT DEFINED NETDATA_SENTRY_RELEASE)
set(NETDATA_SENTRY_RELEASE "${CPACK_PACKAGE_VERSION}")
endif()
FetchContent_Declare( FetchContent_Declare(
sentry sentry
GIT_REPOSITORY https://github.com/getsentry/sentry-native.git GIT_REPOSITORY https://github.com/getsentry/sentry-native.git

1
packaging/cmake/config.cmake.h.in
View file

@ -136,7 +136,6 @@
#cmakedefine ENABLE_SENTRY #cmakedefine ENABLE_SENTRY
#cmakedefine NETDATA_SENTRY_ENVIRONMENT "@NETDATA_SENTRY_ENVIRONMENT@" #cmakedefine NETDATA_SENTRY_ENVIRONMENT "@NETDATA_SENTRY_ENVIRONMENT@"
#cmakedefine NETDATA_SENTRY_RELEASE "@NETDATA_SENTRY_RELEASE@"
#cmakedefine NETDATA_SENTRY_DIST "@NETDATA_SENTRY_DIST@" #cmakedefine NETDATA_SENTRY_DIST "@NETDATA_SENTRY_DIST@"
#cmakedefine NETDATA_SENTRY_DSN "@NETDATA_SENTRY_DSN@" #cmakedefine NETDATA_SENTRY_DSN "@NETDATA_SENTRY_DSN@"
// enabled bundling // enabled bundling

7
src/daemon/sentry-native/sentry-native.c
View file

@ -32,7 +32,12 @@ void nd_sentry_init(void)
sentry_options_set_dsn(options, NETDATA_SENTRY_DSN); sentry_options_set_dsn(options, NETDATA_SENTRY_DSN);
sentry_options_set_database_path(options, path); sentry_options_set_database_path(options, path);
sentry_options_set_environment(options, NETDATA_SENTRY_ENVIRONMENT); sentry_options_set_environment(options, NETDATA_SENTRY_ENVIRONMENT);
sentry_options_set_release(options, NETDATA_SENTRY_RELEASE);
char release[64];
snprintfz(release, 64 - 1, "%s.%s.%s",
NETDATA_VERSION_MINOR, NETDATA_VERSION_PATCH, NETDATA_VERSION_TWEAK);
sentry_options_set_release(options, release);
sentry_options_set_dist(options, NETDATA_SENTRY_DIST); sentry_options_set_dist(options, NETDATA_SENTRY_DIST);
#ifdef NETDATA_INTERNAL_CHECKS #ifdef NETDATA_INTERNAL_CHECKS
sentry_options_set_debug(options, 1); sentry_options_set_debug(options, 1);