Skip to content

out_prometheus_exporter: Handle multiply concatenated metrics type of events #9122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edsiper merged 3 commits into from
Aug 8, 2024
Merged

out_prometheus_exporter: Handle multiply concatenated metrics type of events #9122

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d34a9e7
out_prometheus_exporter: Handle multiply concatenated metrics type of…
cosmo0920 Jul 23, 2024
bea6ede
out_prometheus_exporter: Plug a memory leak
cosmo0920 Aug 4, 2024
8ada2be
out_prometheus_exporter: Plug a leak on error
cosmo0920 Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 46 additions & 24 deletions plugins/out_prometheus_exporter/prom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,44 +175,66 @@ static void cb_prom_flush(struct flb_event_chunk *event_chunk,
int add_ts;
size_t off = 0;
flb_sds_t metrics;
cfl_sds_t text;
cfl_sds_t text = NULL;
cfl_sds_t tmp = NULL;
struct cmt *cmt;
struct prom_exporter *ctx = out_context;
int ok = CMT_DECODE_MSGPACK_SUCCESS;

text = flb_sds_create_size(128);
if (text == NULL) {
flb_plg_debug(ctx->ins, "failed to allocate buffer for text representation of metrics");
FLB_OUTPUT_RETURN(FLB_ERROR);
}

/*
* A new set of metrics has arrived, perform decoding, apply labels,
* convert to Prometheus text format and store the output in the
* hash table for metrics.
* Note that metrics might be concatenated. So, we need to consume
* until the end of event_chunk.
*/
ret = cmt_decode_msgpack_create(&cmt,
(char *) event_chunk->data,
event_chunk->size, &off);
if (ret != 0) {
FLB_OUTPUT_RETURN(FLB_ERROR);
}
while ((ret = cmt_decode_msgpack_create(&cmt,
(char *) event_chunk->data,
event_chunk->size, &off)) == ok) {

/* append labels set by config */
append_labels(ctx, cmt);
if (ret != 0) {
FLB_OUTPUT_RETURN(FLB_ERROR);
Comment thread
cosmo0920 marked this conversation as resolved.
}

/* add timestamp in the output format ? */
if (ctx->add_timestamp) {
add_ts = CMT_TRUE;
}
else {
add_ts = CMT_FALSE;
}
/* append labels set by config */
append_labels(ctx, cmt);

/* add timestamp in the output format ? */
if (ctx->add_timestamp) {
add_ts = CMT_TRUE;
}
else {
add_ts = CMT_FALSE;
}

/* convert to text representation */
text = cmt_encode_prometheus_create(cmt, add_ts);
if (!text) {
/* convert to text representation */
tmp = cmt_encode_prometheus_create(cmt, add_ts);
if (!tmp) {
cmt_destroy(cmt);
Comment thread
cosmo0920 marked this conversation as resolved.
FLB_OUTPUT_RETURN(FLB_ERROR);
}
ret = flb_sds_cat_safe(&text, tmp, flb_sds_len(tmp));
if (ret != 0) {
flb_plg_error(ctx->ins, "could not concatenate text representant coming from: %s",
flb_input_name(ins));
cmt_encode_prometheus_destroy(tmp);
flb_sds_destroy(text);
cmt_destroy(cmt);
FLB_OUTPUT_RETURN(FLB_ERROR);
}
cmt_encode_prometheus_destroy(tmp);
cmt_destroy(cmt);
FLB_OUTPUT_RETURN(FLB_ERROR);
}
cmt_destroy(cmt);

if (cfl_sds_len(text) == 0) {
flb_plg_debug(ctx->ins, "context without metrics (empty)");
cmt_encode_text_destroy(text);
flb_sds_destroy(text);
FLB_OUTPUT_RETURN(FLB_OK);
}

Expand All @@ -221,11 +243,11 @@ static void cb_prom_flush(struct flb_event_chunk *event_chunk,
if (ret == -1) {
flb_plg_error(ctx->ins, "could not store metrics coming from: %s",
flb_input_name(ins));
cmt_encode_prometheus_destroy(text);
flb_sds_destroy(text);
cmt_destroy(cmt);
FLB_OUTPUT_RETURN(FLB_ERROR);
}
cmt_encode_prometheus_destroy(text);
flb_sds_destroy(text);

/* retrieve a full copy of all metrics */
metrics = hash_format_metrics(ctx);
Expand Down