Free analytics data when analytics thread stops (#11575)
* move analytics_free_data to when analytics thread stops * only log hits if analytics is enabled
Emmanuel Vasilakis committed
Sep 28, 2021 at 17:52 UTC
ffc4c5dee09b4a8306e9e906819fc4981e5b00f6
2 files changed
+5
-5
daemon/analytics.c
+5
-4
@@ -150,7 +150,7 @@ void analytics_get_data(char *name, BUFFER *wb)
150
*/
151
void analytics_log_prometheus(void)
152
{
153
- if (likely(analytics_data.prometheus_hits < ANALYTICS_MAX_PROMETHEUS_HITS)) {
153
+ if (netdata_anonymous_statistics_enabled == 1 && likely(analytics_data.prometheus_hits < ANALYTICS_MAX_PROMETHEUS_HITS)) {
154
analytics_data.prometheus_hits++;
155
char b[7];
156
snprintfz(b, 6, "%d", analytics_data.prometheus_hits);
@@ -163,7 +163,7 @@ void analytics_log_prometheus(void)
163
*/
164
void analytics_log_shell(void)
165
{
166
- if (likely(analytics_data.shell_hits < ANALYTICS_MAX_SHELL_HITS)) {
166
+ if (netdata_anonymous_statistics_enabled == 1 && likely(analytics_data.shell_hits < ANALYTICS_MAX_SHELL_HITS)) {
167
analytics_data.shell_hits++;
168
char b[7];
169
snprintfz(b, 6, "%d", analytics_data.shell_hits);
@@ -176,7 +176,7 @@ void analytics_log_shell(void)
176
*/
177
void analytics_log_json(void)
178
{
179
- if (likely(analytics_data.json_hits < ANALYTICS_MAX_JSON_HITS)) {
179
+ if (netdata_anonymous_statistics_enabled == 1 && likely(analytics_data.json_hits < ANALYTICS_MAX_JSON_HITS)) {
180
analytics_data.json_hits++;
181
char b[7];
182
snprintfz(b, 6, "%d", analytics_data.json_hits);
@@ -189,7 +189,7 @@ void analytics_log_json(void)
189
*/
190
void analytics_log_dashboard(void)
191
{
192
- if (likely(analytics_data.dashboard_hits < ANALYTICS_MAX_DASHBOARD_HITS)) {
192
+ if (netdata_anonymous_statistics_enabled == 1 && likely(analytics_data.dashboard_hits < ANALYTICS_MAX_DASHBOARD_HITS)) {
193
analytics_data.dashboard_hits++;
194
char b[7];
195
snprintfz(b, 6, "%d", analytics_data.dashboard_hits);
@@ -589,6 +589,7 @@ void analytics_main_cleanup(void *ptr)
589
static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
590
591
debug(D_ANALYTICS, "Cleaning up...");
592
+ analytics_free_data();
593
594
static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
595
}
daemon/main.c
-1
@@ -28,7 +28,6 @@ void netdata_cleanup_and_exit(int ret) {
28
info("EXIT: netdata prepares to exit with code %d...", ret);
29
30
send_statistics("EXIT", ret?"ERROR":"OK","-");
31
- analytics_free_data();
31
32
char agent_crash_file[FILENAME_MAX + 1];
33
char agent_incomplete_shutdown_file[FILENAME_MAX + 1];