api: proxy: custom: Address comments

Signed-off-by: Hiroshi Hatake <[email protected]>

Author: cosmo0920

include/fluent-bit/flb_api.h

@@ -38,7 +38,6 @@ struct flb_api {
     /* To preserve ABI, we need to add these APIs after the
      * input/output definitions. */
     const char *(*custom_get_property) (const char *, struct flb_custom_instance *);
-    void *(*custom_get_cmt_instance) (struct flb_custom_instance *);
     int (*custom_log_check) (struct flb_custom_instance *, int);
 };
 

include/fluent-bit/flb_custom.h

@@ -107,9 +107,6 @@ int flb_custom_plugin_property_check(struct flb_custom_instance *ins,
 int flb_custom_init_all(struct flb_config *config);
 void flb_custom_set_context(struct flb_custom_instance *ins, void *context);
 void flb_custom_instance_destroy(struct flb_custom_instance *ins);
-#ifdef FLB_HAVE_METRICS
-void *flb_custom_get_cmt_instance(struct flb_custom_instance *ins);
-#endif
 int flb_custom_log_check(struct flb_custom_instance *ins, int l);
 
 #endif

src/flb_api.c

@@ -43,7 +43,6 @@ struct flb_api *flb_api_create()
 #ifdef FLB_HAVE_METRICS
     api->output_get_cmt_instance = flb_output_get_cmt_instance;
     api->input_get_cmt_instance = flb_input_get_cmt_instance;
-    api->custom_get_cmt_instance = flb_custom_get_cmt_instance;
 #endif
 
     api->log_print = flb_log_print;

src/flb_custom.c

@@ -372,12 +372,6 @@ void flb_custom_set_context(struct flb_custom_instance *ins, void *context)
     ins->context = context;
 }
 
-#ifdef FLB_HAVE_METRICS
-void *flb_custom_get_cmt_instance(struct flb_custom_instance *ins)
-{
-    return (void *)ins->cmt;
-}
-#endif
 
 /* Check custom plugin's log level.
  * Not for core plugins but for Golang plugins.

src/proxy/go/go.c

@@ -295,6 +295,7 @@ int proxy_go_custom_register(struct flb_plugin_proxy *proxy,
 
     plugin = flb_malloc(sizeof(struct flbgo_custom_plugin));
     if (!plugin) {
+        flb_errno();
         return -1;
     }
 
@@ -333,8 +334,8 @@ int proxy_go_custom_init(struct flb_plugin_proxy *proxy)
     /* set the API */
     plugin->api   = proxy->api;
     plugin->i_ins = proxy->instance;
-    // In order to avoid having the whole instance as part of the ABI we
-    // copy the context pointer into the plugin.
+    /* In order to avoid having the whole instance as part of the ABI we */
+    /* copy the context pointer into the plugin. */
     plugin->context = ((struct flb_custom_instance *)proxy->instance)->context;
 
     ret = plugin->cb_init(plugin);
@@ -354,7 +355,6 @@ int proxy_go_custom_destroy(struct flb_plugin_proxy_context *ctx)
     struct flbgo_custom_plugin *plugin;
 
     plugin = (struct flbgo_custom_plugin *) ctx->proxy->data;
-    flb_debug("[GO] running exit callback");
 
     if (plugin->cb_exit) {
         ret = plugin->cb_exit();