fix

Author: adriangb

opentelemetry-proto/src/proto.rs

@@ -6,7 +6,7 @@ pub(crate) mod serializers {
     use crate::tonic::common::v1::any_value::{self, Value};
     use crate::tonic::common::v1::AnyValue;
     use serde::de::{self, MapAccess, Visitor};
-    use serde::ser::{SerializeMap, SerializeStruct};
+    use serde::ser::{SerializeMap, SerializeSeq, SerializeStruct};
     use serde::{Deserialize, Deserializer, Serialize, Serializer};
     use std::fmt;
 
@@ -174,6 +174,30 @@ pub(crate) mod serializers {
         s.parse::<u64>().map_err(de::Error::custom)
     }
 
+    pub fn serialize_vec_u64_to_string<S>(value: &[u64], serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let s = value.iter()
+            .map(|v| v.to_string())
+            .collect::<Vec<_>>();
+        let mut sq = serializer.serialize_seq(Some(s.len()))?;
+        for v in value {
+            sq.serialize_element(&v.to_string())?;
+        }
+        sq.end()
+    }
+
+    pub fn deserialize_vec_string_to_vec_u64<'de, D>(deserializer: D) -> Result<Vec<u64>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s: Vec<String> = Deserialize::deserialize(deserializer)?;
+        s.into_iter()
+            .map(|v| v.parse::<u64>().map_err(de::Error::custom))
+            .collect()
+    }
+
     pub fn serialize_i64_to_string<S>(value: &i64, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,

opentelemetry-proto/src/proto/tonic/opentelemetry.proto.profiles.v1development.rs

@@ -124,8 +124,8 @@ pub struct Profile {
     #[cfg_attr(
         feature = "with-serde",
         serde(
-            serialize_with = "crate::proto::serializers::serialize_u64_to_string",
-            deserialize_with = "crate::proto::serializers::deserialize_string_to_u64"
+            serialize_with = "crate::proto::serializers::serialize_i64_to_string",
+            deserialize_with = "crate::proto::serializers::deserialize_string_to_i64"
         )
     )]
     pub time_nanos: i64,
@@ -275,8 +275,8 @@ pub struct Sample {
     #[cfg_attr(
         feature = "with-serde",
         serde(
-            serialize_with = "crate::proto::serializers::serialize_u64_to_string",
-            deserialize_with = "crate::proto::serializers::deserialize_string_to_u64"
+            serialize_with = "crate::proto::serializers::serialize_vec_u64_to_string",
+            deserialize_with = "crate::proto::serializers::deserialize_vec_string_to_vec_u64"
         )
     )]
     pub timestamps_unix_nano: ::prost::alloc::vec::Vec<u64>,

opentelemetry-proto/tests/grpc_build.rs

@@ -109,12 +109,23 @@ fn build_tonic() {
         "metrics.v1.HistogramDataPoint.time_unix_nano",
         "metrics.v1.NumberDataPoint.start_time_unix_nano",
         "metrics.v1.NumberDataPoint.time_unix_nano",
-        "profiles.v1development.Sample.timestamps_unix_nano",
-        "profiles.v1development.Profile.time_nanos",
     ] {
         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\"))]")
     }
+    for path in [
+        "profiles.v1development.Profile.time_nanos",
+    ] {
+        builder = builder
+            .field_attribute(path, "#[cfg_attr(feature = \"with-serde\", serde(serialize_with = \"crate::proto::serializers::serialize_i64_to_string\", deserialize_with = \"crate::proto::serializers::deserialize_string_to_i64\"))]")
+    }
+    for path in [
+        "profiles.v1development.Sample.timestamps_unix_nano",
+    ] {
+        builder = builder
+            .field_attribute(path, "#[cfg_attr(feature = \"with-serde\", serde(serialize_with = \"crate::proto::serializers::serialize_vec_u64_to_string\", deserialize_with = \"crate::proto::serializers::deserialize_vec_string_to_vec_u64\"))]")
+    }
+
 
     // special serializer and deserializer for value
     // The Value::value field must be hidden