processor_metrics_selector: Implement native processor for metrics ma…

…nipulations * Prevent dangling pointer if cmt context is recreated on input_metric and processor. * processor_labels: Follow change of the signature of metrics callback * lib: Support setter for processor to make testing processors easily Signed-off-by: Hiroshi Hatake <[email protected]>
fluent · Mar 14, 2024 · 38b5893 · 38b5893
1 parent 350c9b5
commit 38b5893
Show file tree

Hide file tree

Showing 10 changed files with 984 additions and 537 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -283,9 +283,8 @@ option(FLB_FILTER_GEOIP2               "Enable geoip2 filter"
 option(FLB_FILTER_NIGHTFALL            "Enable Nightfall filter"                      Yes)
 option(FLB_FILTER_WASM                 "Enable WASM filter"                           Yes)
 option(FLB_PROCESSOR_LABELS            "Enable metrics label manipulation processor"  Yes)
-option(FLB_PROCESSOR_ATTRIBUTES        "Enable atributes manipulation processor"      Yes)
+option(FLB_PROCESSOR_METRICS_SELECTOR  "Enable metrics selector processor"            Yes)
 option(FLB_PROCESSOR_CONTENT_MODIFIER  "Enable content modifier processor"            Yes)
-option(FLB_PROCESSOR_SELECTOR          "Enable selector processor"                    Yes)
 
 
 if(DEFINED FLB_NIGHTLY_BUILD AND NOT "${FLB_NIGHTLY_BUILD}" STREQUAL "")

diff --git a/include/fluent-bit/flb_metrics.h b/include/fluent-bit/flb_metrics.h
@@ -39,6 +39,7 @@
 #include <cmetrics/cmt_encode_msgpack.h>
 #include <cmetrics/cmt_encode_splunk_hec.h>
 #include <cmetrics/cmt_encode_cloudwatch_emf.h>
+#include <cmetrics/cmt_filter.h>
 
 /* Metrics IDs for general purpose (used by core and Plugins */
 #define FLB_METRIC_N_RECORDS   0

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -282,8 +282,8 @@ REGISTER_IN_PLUGIN("in_random")
 # PROCESSORS
 # ==========
 REGISTER_PROCESSOR_PLUGIN("processor_labels")
+REGISTER_PROCESSOR_PLUGIN("processor_metrics_selector")
 REGISTER_PROCESSOR_PLUGIN("processor_content_modifier")
-REGISTER_PROCESSOR_PLUGIN("processor_selector")
 
 # OUTPUTS
 # =======

diff --git a/plugins/processor_metrics_selector/CMakeLists.txt b/plugins/processor_metrics_selector/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(src
+  selector.c)
+
+FLB_PLUGIN(processor_metrics_selector "${src}" "")