From: Florian Forster <octo@collectd.org>
Date: Sun, 3 Dec 2023 09:25:31 +0000 (+0100)
Subject: write_open_telemetry plugin: Implement conditional flushing.
X-Git-Tag: 6.0.0-rc0~17^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af6cf698f48081f3274236c24aff56e1a5e57b90;p=thirdparty%2Fcollectd.git

write_open_telemetry plugin: Implement conditional flushing.
---

diff --git a/src/write_open_telemetry.cc b/src/write_open_telemetry.cc
index e306f6cfd..be289d071 100644
--- a/src/write_open_telemetry.cc
+++ b/src/write_open_telemetry.cc
@@ -89,6 +89,7 @@ typedef struct {
   char *port;
   char *path;
 
+  cdtime_t staged_time;
   c_avl_tree_t *staged_metrics;         // char* metric_identity() -> NULL
   c_avl_tree_t *staged_metric_families; // char* fam->name -> metric_family_t*
 
@@ -134,26 +135,24 @@ static void ot_reset_buffer(ot_callback_t *cb) {
 
 /* NOTE: You must hold cb->send_lock when calling this function! */
 static int ot_flush_nolock(cdtime_t timeout, ot_callback_t *cb) {
-#if 0
+  int staged_num = c_avl_size(cb->staged_metrics);
+
   DEBUG("write_open_telemetry plugin: ot_flush_nolock: timeout = %.3f; "
-        "send_buf_fill = %" PRIsz ";",
-        (double)timeout, cb->send_buf_fill);
+        "send_buf_fill = %d;",
+        CDTIME_T_TO_DOUBLE(timeout), staged_num);
+
+  if (c_avl_size(cb->staged_metrics) == 0) {
+    cb->staged_time = cdtime();
+    return 0;
+  }
 
   /* timeout == 0  => flush unconditionally */
   if (timeout > 0) {
-    cdtime_t now;
-
-    now = cdtime();
-    if ((cb->send_buf_init_time + timeout) > now)
+    cdtime_t now = cdtime();
+    if ((cb->staged_time + timeout) > now)
       return 0;
   }
 
-  if (cb->send_buf_fill == 0) {
-    cb->send_buf_init_time = cdtime();
-    return 0;
-  }
-#endif
-
   int status = ot_send_buffer(cb);
   ot_reset_buffer(cb);
 
@@ -252,6 +251,10 @@ static int ot_mark_metric_staged(ot_callback_t *cb, metric_t const *m) {
     return status;
   }
 
+  if (cb->staged_time == 0 || cb->staged_time > m->time) {
+    cb->staged_time = m->time;
+  }
+
   DEBUG("write_open_telemetry plugin: Successfully marked metric \"%s\" as "
         "staged",
         id);