Use semver releases with sentry. (#17746)
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.
vkalintiris committed
May 31, 2024 at 15:47 UTC
b7ec9126c9a553983daebb249bb21818fd6e7430
4 files changed
+6
-10
packaging/build-package.sh
-4
@@ -84,10 +84,6 @@ if [ "${ENABLE_SENTRY}" = "true" ]; then
84
add_cmake_option NETDATA_SENTRY_ENVIRONMENT "${RELEASE_PIPELINE:-Unknown}"
85
add_cmake_option NETDATA_SENTRY_DIST "${BUILD_DESTINATION:-Unknown}"
86
add_cmake_option NETDATA_SENTRY_DSN "${SENTRY_DSN}"
87
-
88
- if [ -n "${VERSION}" ]; then
89
- add_cmake_option NETDATA_SENTRY_RELEASE "${VERSION}"
90
- fi
87
else
88
add_cmake_option ENABLE_SENTRY Off
89
fi
packaging/cmake/Modules/NetdataSentry.cmake
-4
@@ -20,10 +20,6 @@ function(netdata_bundle_sentry)
20
set(SENTRY_BACKEND "breakpad")
21
set(SENTRY_BUILD_SHARED_LIBS OFF)
22
23
- if(NOT DEFINED NETDATA_SENTRY_RELEASE)
24
- set(NETDATA_SENTRY_RELEASE "${CPACK_PACKAGE_VERSION}")
25
- endif()
26
-
23
FetchContent_Declare(
24
sentry
25
GIT_REPOSITORY https://github.com/getsentry/sentry-native.git
packaging/cmake/config.cmake.h.in
-1
@@ -136,7 +136,6 @@
136
137
#cmakedefine ENABLE_SENTRY
138
#cmakedefine NETDATA_SENTRY_ENVIRONMENT "@NETDATA_SENTRY_ENVIRONMENT@"
139
-#cmakedefine NETDATA_SENTRY_RELEASE "@NETDATA_SENTRY_RELEASE@"
139
#cmakedefine NETDATA_SENTRY_DIST "@NETDATA_SENTRY_DIST@"
140
#cmakedefine NETDATA_SENTRY_DSN "@NETDATA_SENTRY_DSN@"
141
// enabled bundling
src/daemon/sentry-native/sentry-native.c
+6
-1
@@ -32,7 +32,12 @@ void nd_sentry_init(void)
32
sentry_options_set_dsn(options, NETDATA_SENTRY_DSN);
33
sentry_options_set_database_path(options, path);
34
sentry_options_set_environment(options, NETDATA_SENTRY_ENVIRONMENT);
35
- sentry_options_set_release(options, NETDATA_SENTRY_RELEASE);
35
+
36
+ char release[64];
37
+ snprintfz(release, 64 - 1, "%s.%s.%s",
38
+ NETDATA_VERSION_MINOR, NETDATA_VERSION_PATCH, NETDATA_VERSION_TWEAK);
39
+ sentry_options_set_release(options, release);
40
+
41
sentry_options_set_dist(options, NETDATA_SENTRY_DIST);
42
#ifdef NETDATA_INTERNAL_CHECKS
43
sentry_options_set_debug(options, 1);