From 1ed04e63537e7137c9b87bde9652b0f203db551d Mon Sep 17 00:00:00 2001 From: Wesley Pettit Date: Sun, 5 Jul 2020 16:44:25 -0700 Subject: [PATCH] out_cloudwatch_logs: alloc event buffer to max size in init Signed-off-by: Wesley Pettit --- plugins/out_cloudwatch_logs/cloudwatch_api.c | 15 --------------- plugins/out_cloudwatch_logs/cloudwatch_logs.c | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/plugins/out_cloudwatch_logs/cloudwatch_api.c b/plugins/out_cloudwatch_logs/cloudwatch_api.c index c06fb00cf2b..27253c21839 100644 --- a/plugins/out_cloudwatch_logs/cloudwatch_api.c +++ b/plugins/out_cloudwatch_logs/cloudwatch_api.c @@ -521,8 +521,6 @@ int add_event(struct flb_cloudwatch *ctx, struct cw_flush *buf, { int ret; struct cw_event *event; - int new_len; - size_t size; int retry_add = FLB_FALSE; int event_bytes = 0; @@ -531,19 +529,6 @@ int add_event(struct flb_cloudwatch *ctx, struct cw_flush *buf, reset_flush_buf(ctx, buf, stream); } - /* re-alloc event buffer if needed */ - if ((buf->event_index + 1) >= buf->events_capacity) { - new_len = MAX_EVENTS_PER_PUT; - size = sizeof(struct cw_event) * new_len; - flb_plg_debug(ctx->ins, "Increasing event buffer to %d", new_len); - buf->events = flb_realloc(buf->events, size); - if (!buf->events) { - flb_errno(); - return -1; - } - buf->events_capacity = new_len; - } - retry_add_event: ret = process_event(ctx, buf, obj, tms); if (ret < 0) { diff --git a/plugins/out_cloudwatch_logs/cloudwatch_logs.c b/plugins/out_cloudwatch_logs/cloudwatch_logs.c index f7273861dde..e44fadceebf 100644 --- a/plugins/out_cloudwatch_logs/cloudwatch_logs.c +++ b/plugins/out_cloudwatch_logs/cloudwatch_logs.c @@ -310,13 +310,13 @@ static int cb_cloudwatch_init(struct flb_output_instance *ins, } buf->tmp_buf_size = PUT_LOG_EVENTS_PAYLOAD_SIZE; - buf->events = flb_malloc(sizeof(struct cw_event) * 1000); + buf->events = flb_malloc(sizeof(struct cw_event) * MAX_EVENTS_PER_PUT); if (!buf->events) { flb_errno(); cw_flush_destroy(buf); goto error; } - buf->events_capacity = 1000; + buf->events_capacity = MAX_EVENTS_PER_PUT; ctx->buf = buf;