Merge branch 'master' of github.com:Leanplum/fluent-bit into stackdriver-trace-support

Author: tpetrov-lp

CMakeLists.txt

@@ -172,6 +172,7 @@ option(FLB_OUT_LIB            "Enable library mode output plugin"   Yes)
 option(FLB_OUT_NULL           "Enable dev null output plugin"       Yes)
 option(FLB_OUT_FLOWCOUNTER    "Enable flowcount output plugin"      Yes)
 option(FLB_OUT_LOGDNA         "Enable LogDNA output plugin"         Yes)
+option(FLB_OUT_LOKI           "Enable Loki output plugin"           Yes)
 option(FLB_OUT_KAFKA          "Enable Kafka output plugin"           No)
 option(FLB_OUT_KAFKA_REST     "Enable Kafka Rest output plugin"     Yes)
 option(FLB_OUT_CLOUDWATCH_LOGS "Enable AWS CloudWatch output plugin" Yes)

include/fluent-bit/flb_output.h

@@ -49,9 +49,10 @@
 #endif
 
 /* Output plugin masks */
-#define FLB_OUTPUT_NET          32  /* output address may set host and port */
-#define FLB_OUTPUT_PLUGIN_CORE   0
-#define FLB_OUTPUT_PLUGIN_PROXY  1
+#define FLB_OUTPUT_NET           32  /* output address may set host and port */
+#define FLB_OUTPUT_PLUGIN_CORE    0
+#define FLB_OUTPUT_PLUGIN_PROXY   1
+#define FLB_OUTPUT_NO_MULTIPLEX 512
 
 /*
  * Tests callbacks
@@ -319,7 +320,9 @@ struct flb_output_thread {
     struct flb_config *config;         /* FLB context        */
     struct flb_output_instance *o_ins; /* output instance    */
     struct flb_thread *parent;         /* parent thread addr */
-    struct mk_list _head;              /* Link to struct flb_task->threads */
+    struct mk_list _head_output;       /* Link to flb_output_instance->th_queue */
+    struct mk_list _head;              /* Link to flb_task->threads */
+
 };
 
 static FLB_INLINE
@@ -348,6 +351,7 @@ static FLB_INLINE int flb_output_thread_destroy_id(int id, struct flb_task *task
         return -1;
     }
 
+    mk_list_del(&out_th->_head_output);
     mk_list_del(&out_th->_head);
     thread = out_th->parent;
 
@@ -367,6 +371,7 @@ static FLB_INLINE void cb_output_thread_destroy(void *data)
     flb_debug("[out thread] cb_destroy thread_id=%i", out_th->id);
 
     out_th->task->users--;
+    mk_list_del(&out_th->_head_output);
     mk_list_del(&out_th->_head);
 }
 
@@ -511,6 +516,8 @@ struct flb_thread *flb_output_thread(struct flb_task *task,
                                                     ((char *)th->callee) + stack_size);
 #endif
 
+    mk_list_add(&out_th->_head_output, &o_ins->th_queue);
+
     /* Workaround for makecontext() */
     output_params_set(th,
                       buf,

plugins/CMakeLists.txt

@@ -178,6 +178,7 @@ REGISTER_OUT_PLUGIN("out_forward")
 REGISTER_OUT_PLUGIN("out_http")
 REGISTER_OUT_PLUGIN("out_influxdb")
 REGISTER_OUT_PLUGIN("out_logdna")
+REGISTER_OUT_PLUGIN("out_loki")
 REGISTER_OUT_PLUGIN("out_kafka")
 REGISTER_OUT_PLUGIN("out_kafka_rest")
 REGISTER_OUT_PLUGIN("out_nats")

plugins/out_loki/CMakeLists.txt

@@ -0,0 +1,5 @@
+set(src
+  loki.c
+  )
+
+FLB_PLUGIN(out_loki "${src}" "")