syslog-ng-otlp: send & expect the $PRI value as an integer

Signed-off-by: Balazs Scheidler <[email protected]>
bazsi · Feb 4, 2024 · 33a5e23 · 33a5e23
1 parent fc058b7
commit 33a5e23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/modules/grpc/otel/otel-protobuf-formatter.cpp b/modules/grpc/otel/otel-protobuf-formatter.cpp
@@ -588,10 +588,9 @@ ProtobufFormatter::set_syslog_ng_macros(LogMessage *msg, LogRecord &log_record)
   gssize len;
   const char *value;
 
-  value = log_msg_get_value_by_name_with_type(msg, "PRI", &len, &type);
   KeyValue *pri_attr = macros_kvlist->add_values();
   pri_attr->set_key("PRI");
-  pri_attr->mutable_value()->set_bytes_value(value, len);
+  pri_attr->mutable_value()->set_int_value(msg->pri);
 
   value = log_msg_get_value_by_name_with_type(msg, "TAGS", &len, &type);
   KeyValue *tags_attr = macros_kvlist->add_values();

diff --git a/modules/grpc/otel/otel-protobuf-parser.cpp b/modules/grpc/otel/otel-protobuf-parser.cpp
@@ -1209,9 +1209,9 @@ syslogng::grpc::otel::ProtobufParser::set_syslog_ng_macros(LogMessage *msg, cons
 
       if (name.compare("PRI") == 0)
         {
-          if (!_value_case_equals(msg, macro, AnyValue::kBytesValue))
+          if (!_value_case_equals(msg, macro, AnyValue::kIntValue))
             continue;
-          msg->pri = log_rewrite_set_pri_convert_pri(macro.value().bytes_value().c_str());
+          msg->pri = macro.value().int_value();
         }
       else if (name.compare("TAGS") == 0)
         {