summaryrefslogtreecommitdiffstats
path: root/exporting
diff options
context:
space:
mode:
authorvkalintiris <vasilis@netdata.cloud>2022-11-22 04:52:15 +0200
committerGitHub <noreply@github.com>2022-11-22 04:52:15 +0200
commit2d5f3acf71f0c759056a3269987fee484566bc4c (patch)
tree5246e1080ea721ba84e5f749f8d8e98d978d81c8 /exporting
parent147552807bc19af949fe3cb315c4743dadfa7f0b (diff)
Do not force internal collectors to call rrdset_next. (#13926)
* Remove calls to rrdset_next(). * Rm checks plugin * Update documentantion * Call rrdset_next from within rrdset_done This wraps up the removal of rrdset_next from internal collectors, which removes a lot of unecessary code and the need for if/else clauses in every place. The pluginsd parser is the only component that calls rrdset_next*() functions because it's not strictly speaking a collector but more of a collector manager/proxy. With the current changes it's possible to simplify the API we expose from RRD significantly, but this will be follow-up work in the future. * Remove stale reference to checks.plugin * Fix RRD unit test rrdset_next is not meant to be called from these tests. * Fix db engine unit test. * Schedule rrdset_next when we have completed at least one collection. * Mark chart creation clauses as unlikely. * Add missing brace to fix FreeBSD plugin.
Diffstat (limited to 'exporting')
-rw-r--r--exporting/send_internal_metrics.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/exporting/send_internal_metrics.c b/exporting/send_internal_metrics.c
index 22188bb902..515cda3b29 100644
--- a/exporting/send_internal_metrics.c
+++ b/exporting/send_internal_metrics.c
@@ -40,9 +40,6 @@ void send_main_rusage(RRDSET *st_rusage, RRDDIM *rd_user, RRDDIM *rd_system)
struct rusage thread;
getrusage(RUSAGE_THREAD, &thread);
- if (likely(st_rusage->counter_done))
- rrdset_next(st_rusage);
-
rrddim_set_by_pointer(st_rusage, rd_user, thread.ru_utime.tv_sec * 1000000ULL + thread.ru_utime.tv_usec);
rrddim_set_by_pointer(st_rusage, rd_system, thread.ru_stime.tv_sec * 1000000ULL + thread.ru_stime.tv_usec);
@@ -132,50 +129,28 @@ void send_internal_metrics(struct instance *instance)
// ------------------------------------------------------------------------
// update the monitoring charts
- if (likely(stats->st_metrics->counter_done))
- rrdset_next(stats->st_metrics);
-
rrddim_set_by_pointer(stats->st_metrics, stats->rd_buffered_metrics, stats->buffered_metrics);
rrddim_set_by_pointer(stats->st_metrics, stats->rd_lost_metrics, stats->lost_metrics);
rrddim_set_by_pointer(stats->st_metrics, stats->rd_sent_metrics, stats->sent_metrics);
-
rrdset_done(stats->st_metrics);
- // ------------------------------------------------------------------------
-
- if (likely(stats->st_bytes->counter_done))
- rrdset_next(stats->st_bytes);
-
rrddim_set_by_pointer(stats->st_bytes, stats->rd_buffered_bytes, stats->buffered_bytes);
rrddim_set_by_pointer(stats->st_bytes, stats->rd_lost_bytes, stats->lost_bytes);
rrddim_set_by_pointer(stats->st_bytes, stats->rd_sent_bytes, stats->sent_bytes);
rrddim_set_by_pointer(stats->st_bytes, stats->rd_received_bytes, stats->received_bytes);
-
rrdset_done(stats->st_bytes);
- // ------------------------------------------------------------------------
-
- if (likely(stats->st_ops->counter_done))
- rrdset_next(stats->st_ops);
-
rrddim_set_by_pointer(stats->st_ops, stats->rd_transmission_successes, stats->transmission_successes);
rrddim_set_by_pointer(stats->st_ops, stats->rd_data_lost_events, stats->data_lost_events);
rrddim_set_by_pointer(stats->st_ops, stats->rd_reconnects, stats->reconnects);
rrddim_set_by_pointer(stats->st_ops, stats->rd_transmission_failures, stats->transmission_failures);
rrddim_set_by_pointer(stats->st_ops, stats->rd_receptions, stats->receptions);
-
rrdset_done(stats->st_ops);
- // ------------------------------------------------------------------------
-
struct rusage thread;
getrusage(RUSAGE_THREAD, &thread);
- if (likely(stats->st_rusage->counter_done))
- rrdset_next(stats->st_rusage);
-
rrddim_set_by_pointer(stats->st_rusage, stats->rd_user, thread.ru_utime.tv_sec * 1000000ULL + thread.ru_utime.tv_usec);
rrddim_set_by_pointer(stats->st_rusage, stats->rd_system, thread.ru_stime.tv_sec * 1000000ULL + thread.ru_stime.tv_usec);
-
rrdset_done(stats->st_rusage);
}