From a9c807ffefa701a9f9e77ec73b12f61674bbd084 Mon Sep 17 00:00:00 2001 From: Balazs Scheidler Date: Fri, 26 Jan 2024 08:30:39 +0100 Subject: [PATCH] syslog-ng-otlp: only send non-local tags to the peer Signed-off-by: Balazs Scheidler --- modules/grpc/otel/otel-protobuf-formatter.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/grpc/otel/otel-protobuf-formatter.cpp b/modules/grpc/otel/otel-protobuf-formatter.cpp index 11641fa64cf..8b5a122bf0f 100644 --- a/modules/grpc/otel/otel-protobuf-formatter.cpp +++ b/modules/grpc/otel/otel-protobuf-formatter.cpp @@ -584,18 +584,16 @@ ProtobufFormatter::set_syslog_ng_macros(LogMessage *msg, LogRecord &log_record) m->set_key("m"); KeyValueList *macros_kvlist = m->mutable_value()->mutable_kvlist_value(); - LogMessageValueType type; - gssize len; - const char *value; - KeyValue *pri_attr = macros_kvlist->add_values(); pri_attr->set_key("PRI"); pri_attr->mutable_value()->set_int_value(msg->pri); - value = log_msg_get_value_by_name_with_type(msg, "TAGS", &len, &type); + GString *tags_value = g_string_sized_new(64); + log_msg_format_tags(msg, tags_value, FALSE); KeyValue *tags_attr = macros_kvlist->add_values(); tags_attr->set_key("TAGS"); - tags_attr->mutable_value()->set_bytes_value(value, len); + tags_attr->mutable_value()->set_bytes_value(tags_value->str, tags_value->len); + g_string_free(tags_value, TRUE); KeyValue *stamp_gmtoff = macros_kvlist->add_values(); stamp_gmtoff->set_key("STAMP_GMTOFF");