Skip to content

Commit 1d4c4dc

Browse files
committed
in_opentelemetry: handle NULL body parameter in otlp_pack_any_value (fix #10674)
Signed-off-by: Eduardo Silva <[email protected]>
1 parent 53bd6cc commit 1d4c4dc

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

plugins/in_opentelemetry/opentelemetry_logs.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,11 @@ static int otlp_pack_any_value(msgpack_packer *mp_pck,
142142

143143
result = -2;
144144

145+
if (body == NULL) {
146+
msgpack_pack_nil(mp_pck);
147+
return 0;
148+
}
149+
145150
switch(body->value_case){
146151
case OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_STRING_VALUE:
147152
result = otel_pack_string(mp_pck, body->string_value);
@@ -537,6 +542,7 @@ static int binary_payload_to_msgpack(struct flb_opentelemetry *ctx,
537542
}
538543
else {
539544
if (ctx->logs_body_key == NULL &&
545+
log_records[log_record_index]->body != NULL &&
540546
log_records[log_record_index]->body->value_case ==
541547
OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_KVLIST_VALUE) {
542548
ret = flb_log_event_encoder_set_body_from_raw_msgpack(

0 commit comments

Comments
 (0)