use json names

Author: pront

lib/codecs/src/encoding/format/otlp.rs

@@ -2,7 +2,8 @@ use crate::encoding::ProtobufSerializer;
 use bytes::BytesMut;
 use opentelemetry_proto::proto::{
     DESCRIPTOR_BYTES, LOGS_REQUEST_MESSAGE_TYPE, METRICS_REQUEST_MESSAGE_TYPE,
-    RESOURCE_LOGS_ROOT_FIELD, RESOURCE_METRICS_ROOT_FIELD, RESOURCE_SPANS_ROOT_FIELD,
+    RESOURCE_LOGS_JSON_FIELD, RESOURCE_LOGS_ROOT_FIELD, RESOURCE_METRICS_JSON_FIELD,
+    RESOURCE_METRICS_ROOT_FIELD, RESOURCE_SPANS_JSON_FIELD, RESOURCE_SPANS_ROOT_FIELD,
     TRACES_REQUEST_MESSAGE_TYPE,
 };
 use tokio_util::codec::Encoder;
@@ -98,26 +99,28 @@ impl Encoder<Event> for OtlpSerializer {
     fn encode(&mut self, event: Event, buffer: &mut BytesMut) -> Result<(), Self::Error> {
         // Determine which descriptor to use based on top-level OTLP fields
         // This handles events that were decoded with use_otlp_decoding enabled
+        // We check both protobuf field names (snake_case) and JSON field names (camelCase)
+        // because the deserializer may use either depending on the use_json_names option
         match &event {
             Event::Log(log) => {
-                if log.contains(RESOURCE_LOGS_ROOT_FIELD) {
+                if log.contains(RESOURCE_LOGS_ROOT_FIELD) || log.contains(RESOURCE_LOGS_JSON_FIELD) {
                     self.logs_descriptor.encode(event, buffer)
-                } else if log.contains(RESOURCE_METRICS_ROOT_FIELD) {
+                } else if log.contains(RESOURCE_METRICS_ROOT_FIELD) || log.contains(RESOURCE_METRICS_JSON_FIELD) {
                     // Currently the OTLP metrics are Vector logs (not metrics).
                     self.metrics_descriptor.encode(event, buffer)
                 } else {
                     Err(format!(
-                        "Log event does not contain OTLP top-level fields ({RESOURCE_LOGS_ROOT_FIELD} or {RESOURCE_METRICS_ROOT_FIELD})",
+                        "Log event does not contain OTLP top-level fields ({RESOURCE_LOGS_ROOT_FIELD}/{RESOURCE_LOGS_JSON_FIELD} or {RESOURCE_METRICS_ROOT_FIELD}/{RESOURCE_METRICS_JSON_FIELD})",
                     )
                         .into())
                 }
             }
             Event::Trace(trace) => {
-                if trace.contains(RESOURCE_SPANS_ROOT_FIELD) {
+                if trace.contains(RESOURCE_SPANS_ROOT_FIELD) || trace.contains(RESOURCE_SPANS_JSON_FIELD) {
                     self.traces_descriptor.encode(event, buffer)
                 } else {
                     Err(format!(
-                        "Trace event does not contain OTLP top-level field ({RESOURCE_SPANS_ROOT_FIELD})",
+                        "Trace event does not contain OTLP top-level field ({RESOURCE_SPANS_ROOT_FIELD}/{RESOURCE_SPANS_JSON_FIELD})",
                     )
                         .into())
                 }

lib/opentelemetry-proto/src/proto.rs

@@ -9,6 +9,11 @@ pub const RESOURCE_LOGS_ROOT_FIELD: &str = "resource_logs";
 pub const RESOURCE_METRICS_ROOT_FIELD: &str = "resource_metrics";
 pub const RESOURCE_SPANS_ROOT_FIELD: &str = "resource_spans";
 
+// JSON names (camelCase) for the same fields, used when use_json_names is enabled
+pub const RESOURCE_LOGS_JSON_FIELD: &str = "resourceLogs";
+pub const RESOURCE_METRICS_JSON_FIELD: &str = "resourceMetrics";
+pub const RESOURCE_SPANS_JSON_FIELD: &str = "resourceSpans";
+
 /// Service stub and clients.
 pub mod collector {
     pub mod trace {