Skip to content
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

out_opentelemetry: add gzip compression #6232

Merged
merged 2 commits into from
Nov 16, 2022
Merged

out_opentelemetry: add gzip compression #6232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cdbfe7
out_opentelemetry: add gzip compression
flobz Oct 30, 2022
a7dace2
fix: memory leak
flobz Nov 14, 2022
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
35 changes: 32 additions & 3 deletions plugins/out_opentelemetry/opentelemetry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <fluent-otel-proto/fluent-otel.h>

#include <cmetrics/cmetrics.h>
#include <fluent-bit/flb_gzip.h>
#include <cmetrics/cmt_encode_opentelemetry.h>

#include <ctraces/ctraces.h>
Expand Down Expand Up @@ -55,6 +56,9 @@ static int http_post(struct opentelemetry_context *ctx,
struct flb_config_map_val *mv;
struct flb_slist_entry *key = NULL;
struct flb_slist_entry *val = NULL;
void *final_body = NULL;
size_t final_body_len = 0;
int compressed = FLB_FALSE;

/* Get upstream context and connection */
u = ctx->u;
Expand All @@ -64,10 +68,21 @@ static int http_post(struct opentelemetry_context *ctx,
u->tcp_host, u->tcp_port);
return FLB_RETRY;
}

if (ctx->compress_gzip == FLB_TRUE) {
ret = flb_gzip_compress((void *) body, body_len,
&final_body, &final_body_len);
if (ret == -1) {
flb_plg_error(ctx->ins, "cannot gzip payload, disabling compression");
} else {
compressed = FLB_TRUE;
}
} else {
final_body = body;
final_body_len = body_len;
}
/* Create HTTP client context */
c = flb_http_client(u_conn, FLB_HTTP_POST, uri,
body, body_len,
final_body, final_body_len,
ctx->host, ctx->port,
ctx->proxy, 0);

Expand Down Expand Up @@ -107,7 +122,9 @@ static int http_post(struct opentelemetry_context *ctx,
key->str, flb_sds_len(key->str),
val->str, flb_sds_len(val->str));
}

if (compressed == FLB_TRUE) {
flb_http_set_content_encoding_gzip(c);
}
ret = flb_http_do(c, &b_sent);
if (ret == 0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your valgrind report says there is a memory leak:

==407985== LEAK SUMMARY:
==407985==    definitely lost: 925,638 bytes in 21 blocks

looking at the changes it seems like the new buffer allocated for the compressed gzip is not being free, so on every flush with gzip, you are leaking the allocated memory.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok thanks for the help. It should be fixed.

/*
Expand Down Expand Up @@ -154,6 +171,13 @@ static int http_post(struct opentelemetry_context *ctx,
out_ret = FLB_RETRY;
}

/*
* If the payload buffer is different than incoming records in body, means
* we generated a different payload and must be freed.
*/
if (final_body != body) {
flb_free(final_body);
}
/* Destroy HTTP client context */
flb_http_client_destroy(c);

Expand Down Expand Up @@ -606,6 +630,11 @@ static struct flb_config_map config_map[] = {
0, FLB_TRUE, offsetof(struct opentelemetry_context, log_response_payload),
"Specify if the response paylod should be logged or not"
},
{
FLB_CONFIG_MAP_STR, "compress", NULL,
0, FLB_FALSE, 0,
"Set payload compression mechanism. Option available is 'gzip'"
},
/* EOF */
{0}
};
Expand Down
3 changes: 3 additions & 0 deletions plugins/out_opentelemetry/opentelemetry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ struct opentelemetry_context {

/* instance context */
struct flb_output_instance *ins;

/* Compression mode (gzip) */
int compress_gzip;
};

#endif
9 changes: 9 additions & 0 deletions plugins/out_opentelemetry/opentelemetry_conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ struct opentelemetry_context *flb_opentelemetry_context_create(
char *logs_uri = NULL;
struct flb_upstream *upstream;
struct opentelemetry_context *ctx = NULL;
char *tmp = NULL;

/* Allocate plugin context */
ctx = flb_calloc(1, sizeof(struct opentelemetry_context));
Expand Down Expand Up @@ -232,6 +233,14 @@ struct opentelemetry_context *flb_opentelemetry_context_create(
/* Set instance flags into upstream */
flb_output_upstream_set(ctx->u, ins);

tmp = flb_output_get_property("compress", ins);
ctx->compress_gzip = FLB_FALSE;
if (tmp) {
if (strcasecmp(tmp, "gzip") == 0) {
ctx->compress_gzip = FLB_TRUE;
}
}

return ctx;
}

Expand Down