filter: Handle each of types of events if capabilities can handle them

Signed-off-by: Hiroshi Hatake <[email protected]>
fluent · Jan 29, 2024 · 15c9aba · 15c9aba
1 parent fdf8795
commit 15c9aba
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/include/fluent-bit/flb_filter.h b/include/fluent-bit/flb_filter.h
@@ -21,6 +21,7 @@
 #define FLB_FILTER_H
 
 #include <fluent-bit/flb_info.h>
+#include <fluent-bit/flb_input.h>
 
 #ifdef FLB_HAVE_REGEX
 #include <fluent-bit/flb_regex.h>

diff --git a/src/flb_filter.c b/src/flb_filter.c
@@ -75,6 +75,25 @@ static inline int prop_key_check(const char *key, const char *kv, int k_len)
     return -1;
 }
 
+static inline int flb_filter_match_type(int in_event_type,
+                                        struct flb_filter_instance *f_ins)
+{
+    if (in_event_type == FLB_INPUT_LOGS &&
+        !(f_ins->event_type & FLB_FILTER_LOGS)) {
+        return FLB_FALSE;
+    }
+    else if (in_event_type == FLB_INPUT_METRICS &&
+             !(f_ins->event_type & FLB_FILTER_METRICS)) {
+        return FLB_FALSE;
+    }
+    else if (in_event_type == FLB_INPUT_TRACES &&
+             !(f_ins->event_type & FLB_FILTER_TRACES)) {
+        return FLB_FALSE;
+    }
+
+    return FLB_TRUE;
+}
+
 void flb_filter_do(struct flb_input_chunk *ic,
                    const void *data, size_t bytes,
                    void **out_data, size_t *out_bytes,
@@ -138,6 +157,10 @@ void flb_filter_do(struct flb_input_chunk *ic,
             continue;
         }
 
+        if (!flb_filter_match_type(event_type, f_ins)) {
+            continue;
+        }
+
         if (flb_router_match(ntag, tag_len, f_ins->match
 #ifdef FLB_HAVE_REGEX
         , f_ins->match_regex