Skip to content

Commit 9acc914

Browse files
committed
in_prometheus_remote_write: defer worker ingestion
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
1 parent 9ff2e88 commit 9acc914

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

plugins/in_prometheus_remote_write/prom_rw.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,12 @@ static inline int prom_rw_uses_worker_ingress_queue(
5252
static inline int prom_rw_ingest_metrics(struct flb_prom_remote_write *ctx,
5353
const char *tag,
5454
size_t tag_len,
55-
struct cmt *cmt)
55+
struct cmt *cmt,
56+
size_t payload_size)
5657
{
5758
if (prom_rw_uses_worker_ingress_queue(ctx)) {
58-
return flb_input_ingress_queue_metrics(ctx->ins, tag, tag_len, cmt);
59+
return flb_input_ingress_queue_metrics(ctx->ins, tag, tag_len,
60+
cmt, payload_size);
5961
}
6062

6163
return flb_input_metrics_append(ctx->ins, tag, tag_len, cmt);

plugins/in_prometheus_remote_write/prom_rw_prot.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,10 @@ static int process_payload_metrics_ng(struct flb_prom_remote_write *ctx,
7474
return 400;
7575
}
7676

77-
result = prom_rw_ingest_metrics(ctx, NULL, 0, context);
77+
result = prom_rw_ingest_metrics(ctx, NULL, 0, context,
78+
cfl_sds_len(request->body));
7879

79-
if (prom_rw_uses_worker_ingress_queue(ctx)) {
80-
if (result != 0 && result != FLB_INPUT_INGRESS_BUSY) {
81-
cmt_decode_prometheus_remote_write_destroy(context);
82-
}
83-
}
84-
else {
80+
if (!prom_rw_uses_worker_ingress_queue(ctx)) {
8581
cmt_decode_prometheus_remote_write_destroy(context);
8682
}
8783

0 commit comments

Comments
 (0)