flb_filter: add flb_input_instance to cb_filter callback

Signed-off-by: Wesley Pettit <[email protected]>
PettitWesley · Oct 31, 2021 · 44198bc · 44198bc
1 parent 18900b7
commit 44198bc
Show file tree

Hide file tree

Showing 20 changed files with 37 additions and 1 deletion.
diff --git a/include/fluent-bit/flb_filter.h b/include/fluent-bit/flb_filter.h
@@ -59,6 +59,7 @@ struct flb_filter_plugin {
                       const char *, int,
                       void **, size_t *,
                       struct flb_filter_instance *,
+                      struct flb_input_instance *,
                       void *, struct flb_config *);
     int (*cb_exit) (void *, struct flb_config *);
 

diff --git a/plugins/filter_alter_size/alter_size.c b/plugins/filter_alter_size/alter_size.c
@@ -63,6 +63,7 @@ static int cb_alter_size_filter(const void *data, size_t bytes,
                                 const char *tag, int tag_len,
                                 void **out_buf, size_t *out_size,
                                 struct flb_filter_instance *ins,
+                                struct flb_input_instance *i_ins,
                                 void *filter_context,
                                 struct flb_config *config)
 {
@@ -73,6 +74,7 @@ static int cb_alter_size_filter(const void *data, size_t bytes,
     int count = 0;
     size_t off = 0;
     (void) config;
+    (void) i_ins;
     char tmp[32];
     msgpack_unpacked result;
     msgpack_object root;

diff --git a/plugins/filter_aws/aws.c b/plugins/filter_aws/aws.c
@@ -403,11 +403,13 @@ static int cb_aws_filter(const void *data, size_t bytes,
                          const char *tag, int tag_len,
                          void **out_buf, size_t *out_size,
                          struct flb_filter_instance *f_ins,
+                         struct flb_input_instance *i_ins,
                          void *context,
                          struct flb_config *config)
 {
     struct flb_filter_aws *ctx = context;
     (void) f_ins;
+    (void) i_ins;
     (void) config;
     size_t off = 0;
     int i = 0;

diff --git a/plugins/filter_checklist/checklist.c b/plugins/filter_checklist/checklist.c
@@ -381,6 +381,7 @@ static int cb_checklist_filter(const void *data, size_t bytes,
                                const char *tag, int tag_len,
                                void **out_buf, size_t *out_bytes,
                                struct flb_filter_instance *ins,
+                               struct flb_input_instance *i_ins,
                                void *filter_context,
                                struct flb_config *config)
 {
@@ -406,6 +407,7 @@ static int cb_checklist_filter(const void *data, size_t bytes,
     struct flb_time t_diff;
 
     (void) ins;
+    (void) i_ins;
     (void) config;
 
     msgpack_sbuffer_init(&mp_sbuf);

diff --git a/plugins/filter_expect/expect.c b/plugins/filter_expect/expect.c
@@ -390,6 +390,7 @@ static int cb_expect_filter(const void *data, size_t bytes,
                             const char *tag, int tag_len,
                             void **out_buf, size_t *out_bytes,
                             struct flb_filter_instance *f_ins,
+                            struct flb_input_instance *i_ins,
                             void *filter_context,
                             struct flb_config *config)
 {
@@ -399,6 +400,7 @@ static int cb_expect_filter(const void *data, size_t bytes,
     (void) out_buf;
     (void) out_bytes;
     (void) f_ins;
+    (void) i_ins;
     (void) config;
     msgpack_object map;
     msgpack_object root;

diff --git a/plugins/filter_geoip2/geoip2.c b/plugins/filter_geoip2/geoip2.c
@@ -375,6 +375,7 @@ static int cb_geoip2_filter(const void *data, size_t bytes,
                             const char *tag, int tag_len,
                             void **out_buf, size_t *out_size,
                             struct flb_filter_instance *f_ins,
+                            struct flb_input_instance *i_ins,
                             void *context,
                             struct flb_config *config)
 {

diff --git a/plugins/filter_grep/grep.c b/plugins/filter_grep/grep.c
@@ -206,6 +206,7 @@ static int cb_grep_filter(const void *data, size_t bytes,
                           const char *tag, int tag_len,
                           void **out_buf, size_t *out_size,
                           struct flb_filter_instance *f_ins,
+                          struct flb_input_instance *i_ins,
                           void *context,
                           struct flb_config *config)
 {
@@ -217,6 +218,7 @@ static int cb_grep_filter(const void *data, size_t bytes,
     msgpack_object root;
     size_t off = 0;
     (void) f_ins;
+    (void) i_ins;
     (void) config;
     msgpack_sbuffer tmp_sbuf;
     msgpack_packer tmp_pck;

diff --git a/plugins/filter_kubernetes/kubernetes.c b/plugins/filter_kubernetes/kubernetes.c
@@ -437,6 +437,7 @@ static int cb_kube_filter(const void *data, size_t bytes,
                           const char *tag, int tag_len,
                           void **out_buf, size_t *out_bytes,
                           struct flb_filter_instance *f_ins,
+                          struct flb_input_instance *i_ins,
                           void *filter_context,
                           struct flb_config *config)
 {
@@ -458,6 +459,7 @@ static int cb_kube_filter(const void *data, size_t bytes,
     struct flb_kube_props props = {0};
     struct flb_time time_lookup;
     (void) f_ins;
+    (void) i_ins;
     (void) config;
 
     if (ctx->use_journal == FLB_FALSE || ctx->dummy_meta == FLB_TRUE) {

diff --git a/plugins/filter_lua/lua.c b/plugins/filter_lua/lua.c
@@ -490,12 +490,14 @@ static int cb_lua_filter(const void *data, size_t bytes,
                          const char *tag, int tag_len,
                          void **out_buf, size_t *out_bytes,
                          struct flb_filter_instance *f_ins,
+                         struct flb_input_instance *i_ins,
                          void *filter_context,
                          struct flb_config *config)
 {
     int ret;
     size_t off = 0;
     (void) f_ins;
+    (void) i_ins;
     (void) config;
     double ts = 0;
     msgpack_object *p;

diff --git a/plugins/filter_modify/modify.c b/plugins/filter_modify/modify.c
@@ -1277,11 +1277,13 @@ static int cb_modify_filter(const void *data, size_t bytes,
                             const char *tag, int tag_len,
                             void **out_buf, size_t * out_size,
                             struct flb_filter_instance *f_ins,
+                            struct flb_input_instance *i_ins,
                             void *context, struct flb_config *config)
 {
     msgpack_unpacked result;
     size_t off = 0;
     (void) f_ins;
+    (void) i_ins;
     (void) config;
 
     struct filter_modify_ctx *ctx = context;

diff --git a/plugins/filter_multiline/ml.c b/plugins/filter_multiline/ml.c
@@ -157,6 +157,7 @@ static int cb_ml_filter(const void *data, size_t bytes,
                         const char *tag, int tag_len,
                         void **out_buf, size_t *out_bytes,
                         struct flb_filter_instance *f_ins,
+                        struct flb_input_instance *i_ins,
                         void *filter_context,
                         struct flb_config *config)
 {
@@ -166,7 +167,6 @@ static int cb_ml_filter(const void *data, size_t bytes,
     (void) out_buf;
     (void) out_bytes;
     (void) f_ins;
-    (void) filter_context;
     (void) config;
     msgpack_unpacked result;
     msgpack_object *obj;

diff --git a/plugins/filter_nest/nest.c b/plugins/filter_nest/nest.c
@@ -552,11 +552,13 @@ static int cb_nest_filter(const void *data, size_t bytes,
                           const char *tag, int tag_len,
                           void **out_buf, size_t * out_size,
                           struct flb_filter_instance *f_ins,
+                          struct flb_input_instance *i_ins,
                           void *context, struct flb_config *config)
 {
     msgpack_unpacked result;
     size_t off = 0;
     (void) f_ins;
+    (void) i_ins;
     (void) config;
 
     struct filter_nest_ctx *ctx = context;

diff --git a/plugins/filter_parser/filter_parser.c b/plugins/filter_parser/filter_parser.c
@@ -182,6 +182,7 @@ static int cb_parser_filter(const void *data, size_t bytes,
                             const char *tag, int tag_len,
                             void **ret_buf, size_t *ret_bytes,
                             struct flb_filter_instance *f_ins,
+                            struct flb_input_instance *i_ins,
                             void *context,
                             struct flb_config *config)
 {
@@ -190,6 +191,7 @@ static int cb_parser_filter(const void *data, size_t bytes,
     msgpack_unpacked result;
     size_t off = 0;
     (void) f_ins;
+    (void) i_ins;
     (void) config;
     struct flb_time tm;
     msgpack_object *obj;

diff --git a/plugins/filter_record_modifier/filter_modifier.c b/plugins/filter_record_modifier/filter_modifier.c
@@ -254,6 +254,7 @@ static int cb_modifier_filter(const void *data, size_t bytes,
                               const char *tag, int tag_len,
                               void **out_buf, size_t *out_size,
                               struct flb_filter_instance *f_ins,
+                              struct flb_input_instance *i_ins,
                               void *context,
                               struct flb_config *config)
 {
@@ -265,6 +266,7 @@ static int cb_modifier_filter(const void *data, size_t bytes,
     int map_num          = 0;
     bool_map_t *bool_map = NULL;
     (void) f_ins;
+    (void) i_ins;
     (void) config;
     struct flb_time tm;
     struct modifier_record *mod_rec;

diff --git a/plugins/filter_rewrite_tag/rewrite_tag.c b/plugins/filter_rewrite_tag/rewrite_tag.c
@@ -352,6 +352,7 @@ static int cb_rewrite_tag_filter(const void *data, size_t bytes,
                                  const char *tag, int tag_len,
                                  void **out_buf, size_t *out_bytes,
                                  struct flb_filter_instance *f_ins,
+                                 struct flb_input_instance *i_ins,
                                  void *filter_context,
                                  struct flb_config *config)
 {
@@ -371,6 +372,7 @@ static int cb_rewrite_tag_filter(const void *data, size_t bytes,
     msgpack_unpacked result;
     struct flb_rewrite_tag *ctx = (struct flb_rewrite_tag *) filter_context;
     (void) config;
+    (void) i_ins;
 
 #ifdef FLB_HAVE_METRICS
     ts = cmt_time_now();

diff --git a/plugins/filter_stdout/stdout.c b/plugins/filter_stdout/stdout.c
@@ -41,6 +41,7 @@ static int cb_stdout_filter(const void *data, size_t bytes,
                             const char *tag, int tag_len,
                             void **out_buf, size_t *out_bytes,
                             struct flb_filter_instance *f_ins,
+                            struct flb_input_instance *i_ins,
                             void *filter_context,
                             struct flb_config *config)
 {
@@ -49,6 +50,7 @@ static int cb_stdout_filter(const void *data, size_t bytes,
     (void) out_buf;
     (void) out_bytes;
     (void) f_ins;
+    (void) i_ins;
     (void) filter_context;
     (void) config;
     struct flb_time tmp;

diff --git a/plugins/filter_tensorflow/tensorflow.c b/plugins/filter_tensorflow/tensorflow.c
@@ -225,6 +225,7 @@ static int cb_tf_filter(const void *data, size_t bytes,
                         const char *tag, int tag_len,
                         void **out_buf, size_t *out_bytes,
                         struct flb_filter_instance *f_ins,
+                        struct flb_input_instance *i_ins,
                         void *filter_context,
                         struct flb_config *config)
 {
@@ -235,6 +236,7 @@ static int cb_tf_filter(const void *data, size_t bytes,
     (void) out_buf;
     (void) out_bytes;
     (void) f_ins;
+    (void) i_ins;
     int map_size;
 
     msgpack_object root;

diff --git a/plugins/filter_throttle/throttle.c b/plugins/filter_throttle/throttle.c
@@ -218,6 +218,7 @@ static int cb_throttle_filter(const void *data, size_t bytes,
                               const char *tag, int tag_len,
                               void **out_buf, size_t *out_size,
                               struct flb_filter_instance *f_ins,
+                              struct flb_input_instance *i_ins,
                               void *context,
                               struct flb_config *config)
 {
@@ -228,6 +229,7 @@ static int cb_throttle_filter(const void *data, size_t bytes,
     msgpack_object root;
     size_t off = 0;
     (void) f_ins;
+    (void) i_ins;
     (void) config;
     msgpack_sbuffer tmp_sbuf;
     msgpack_packer tmp_pck;

diff --git a/plugins/filter_throttle_size/throttle_size.c b/plugins/filter_throttle_size/throttle_size.c
@@ -659,6 +659,7 @@ static int cb_throttle_size_filter(const void *data, size_t bytes,
                                    const char *tag, int tag_len,
                                    void **out_buf, size_t * out_size,
                                    struct flb_filter_instance *ins,
+                                   struct flb_input_instance *i_ins,
                                    void *context, struct flb_config *config)
 {
     int ret;
@@ -669,6 +670,7 @@ static int cb_throttle_size_filter(const void *data, size_t bytes,
     msgpack_object map;
     size_t off = 0;
     (void) ins;
+    (void) i_ins;
     (void) config;
     msgpack_sbuffer tmp_sbuf;
     msgpack_packer tmp_pck;

diff --git a/src/flb_filter.c b/src/flb_filter.c
@@ -78,6 +78,7 @@ void flb_filter_do(struct flb_input_chunk *ic,
     ssize_t write_at;
     struct mk_list *head;
     struct flb_filter_instance *f_ins;
+    struct flb_input_instance *i_ins = ic->in;
 
     /* For the incoming Tag make sure to create a NULL terminated reference */
     ntag = flb_malloc(tag_len + 1);
@@ -127,6 +128,7 @@ void flb_filter_do(struct flb_input_chunk *ic,
                                       &out_buf,       /* new data         */
                                       &out_size,      /* new data size    */
                                       f_ins,          /* filter instance  */
+                                      i_ins,          /* input instance   */
                                       f_ins->context, /* filter priv data */
                                       config);