fix ts encoding

Author: lalitb

opentelemetry-proto/src/proto.rs

@@ -69,7 +69,21 @@ pub(crate) mod serializers {
         Ok(Some(AnyValue { value }))
     }
 
+    pub fn serialize_u64_to_string<S>(value: &u64, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let s = value.to_string();
+        serializer.serialize_str(&s)
+    }
 
+    pub fn deserialize_string_to_u64<'de, D>(deserializer: D) -> Result<u64, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s: String = Deserialize::deserialize(deserializer)?;
+        s.parse::<u64>().map_err(de::Error::custom)
+    }
 }
 
 #[cfg(feature = "gen-tonic-messages")]

opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.logs.v1.rs

@@ -1,4 +1,3 @@
-// This file is @generated by prost-build.
 #[cfg_attr(feature = "with-schemars", derive(schemars::JsonSchema))]
 #[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]

opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.metrics.v1.rs

@@ -1,4 +1,3 @@
-// This file is @generated by prost-build.
 #[cfg_attr(feature = "with-schemars", derive(schemars::JsonSchema))]
 #[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]

opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.trace.v1.rs

@@ -1,4 +1,3 @@
-// This file is @generated by prost-build.
 #[cfg_attr(feature = "with-schemars", derive(schemars::JsonSchema))]
 #[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]

opentelemetry-proto/src/proto/tonic/opentelemetry.proto.common.v1.rs

@@ -1,4 +1,3 @@
-// This file is @generated by prost-build.
 /// AnyValue is used to represent any type of attribute value. AnyValue may contain a
 /// primitive value such as a string or integer or it may contain an arbitrary nested
 /// object containing arrays, key-value lists and primitives.

opentelemetry-proto/src/proto/tonic/opentelemetry.proto.logs.v1.rs

@@ -1,4 +1,3 @@
-// This file is @generated by prost-build.
 /// LogsData represents the logs data that can be stored in a persistent storage,
 /// OR can be embedded by other protocols that transfer OTLP logs data but do not
 /// implement the OTLP protocol.

opentelemetry-proto/src/proto/tonic/opentelemetry.proto.metrics.v1.rs

@@ -1,4 +1,3 @@
-// This file is @generated by prost-build.
 /// MetricsData represents the metrics data that can be stored in a persistent
 /// storage, OR can be embedded by other protocols that transfer OTLP metrics
 /// data but do not implement the OTLP protocol.

opentelemetry-proto/src/proto/tonic/opentelemetry.proto.resource.v1.rs

@@ -1,4 +1,3 @@
-// This file is @generated by prost-build.
 /// Resource information.
 #[cfg_attr(feature = "with-schemars", derive(schemars::JsonSchema))]
 #[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]

opentelemetry-proto/src/proto/tonic/opentelemetry.proto.trace.v1.rs

@@ -1,4 +1,3 @@
-// This file is @generated by prost-build.
 /// TracesData represents the traces data that can be stored in a persistent storage,
 /// OR can be embedded by other protocols that transfer OTLP traces data but do
 /// not implement the OTLP protocol.
@@ -166,6 +165,13 @@ pub struct Span {
     ///
     /// This field is semantically required and it is expected that end_time >= start_time.
     #[prost(fixed64, tag = "7")]
+    #[cfg_attr(
+        feature = "with-serde",
+        serde(
+            serialize_with = "crate::proto::serializers::serialize_u64_to_string",
+            deserialize_with = "crate::proto::serializers::deserialize_string_to_u64"
+        )
+    )]
     pub start_time_unix_nano: u64,
     /// end_time_unix_nano is the end time of the span. On the client side, this is the time
     /// kept by the local machine where the span execution ends. On the server side, this
@@ -174,6 +180,13 @@ pub struct Span {
     ///
     /// This field is semantically required and it is expected that end_time >= start_time.
     #[prost(fixed64, tag = "8")]
+    #[cfg_attr(
+        feature = "with-serde",
+        serde(
+            serialize_with = "crate::proto::serializers::serialize_u64_to_string",
+            deserialize_with = "crate::proto::serializers::deserialize_string_to_u64"
+        )
+    )]
     pub end_time_unix_nano: u64,
     /// attributes is a collection of key/value pairs. Note, global attributes
     /// like server name can be set using the resource API. Examples of attributes:
@@ -227,6 +240,13 @@ pub mod span {
     pub struct Event {
         /// time_unix_nano is the time the event occurred.
         #[prost(fixed64, tag = "1")]
+        #[cfg_attr(
+            feature = "with-serde",
+            serde(
+                serialize_with = "crate::proto::serializers::serialize_u64_to_string",
+                deserialize_with = "crate::proto::serializers::deserialize_string_to_u64"
+            )
+        )]
         pub time_unix_nano: u64,
         /// name of the event.
         /// This field is semantically required to be set to non-empty string.

opentelemetry-proto/src/proto/tonic/opentelemetry.proto.tracez.v1.rs

@@ -1,4 +1,3 @@
-// This file is @generated by prost-build.
 #[cfg_attr(feature = "with-schemars", derive(schemars::JsonSchema))]
 #[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]

opentelemetry-proto/tests/grpc_build.rs

@@ -73,6 +73,19 @@ fn build_tonic() {
             .field_attribute(path, "#[cfg_attr(feature = \"with-serde\", serde(serialize_with = \"crate::proto::serializers::serialize_to_hex_string\", deserialize_with = \"crate::proto::serializers::deserialize_from_hex_string\"))]")
     }
 
+    // special serializer and deserializer for timestamp
+    // OTLP/JSON format may uses string for timestamp
+    // the proto file uses u64 for timestamp
+    // Thus, special serializer and deserializer are needed
+    for path in [
+        "trace.v1.Span.start_time_unix_nano",
+        "trace.v1.Span.end_time_unix_nano",
+        "trace.v1.Span.Event.time_unix_nano",
+    ] {
+        builder = builder
+            .field_attribute(path, "#[cfg_attr(feature = \"with-serde\", serde(serialize_with = \"crate::proto::serializers::serialize_u64_to_string\", deserialize_with = \"crate::proto::serializers::deserialize_string_to_u64\"))]")
+    }
+
     // add custom serializer and deserializer for AnyValue
     builder = builder
         .field_attribute("common.v1.KeyValue.value", "#[cfg_attr(feature =\"with-serde\", serde(serialize_with = \"crate::proto::serializers::serialize_to_value\", deserialize_with = \"crate::proto::serializers::deserialize_from_value\"))]");