Merge branch 'main' into server-start-fixes-distributed

nikhilsinhaparseable · web-flow · commit 4df5a5d5150e · 2024-06-21T00:24:57.000+05:30
diff --git a/server/src/handlers/http/otel.rs b/server/src/handlers/http/otel.rs
@@ -47,7 +47,7 @@ fn collect_json_from_any_value(
     if value.double_val.is_some() {
         value_json.insert(
             key.to_string(),
-            Value::String(value.double_val.as_ref().unwrap().to_owned()),
+            Value::Number(serde_json::Number::from_f64(value.double_val.unwrap()).unwrap()),
         );
     }
 
diff --git a/server/src/handlers/http/otel/opentelemetry.proto.common.v1.rs b/server/src/handlers/http/otel/opentelemetry.proto.common.v1.rs
@@ -39,7 +39,7 @@
      #[serde(rename = "intValue")]
      pub int_val: Option<String>,
      #[serde(rename = "doubleValue")]
-     pub double_val: Option<String>,
+     pub double_val: Option<f64>,
      #[serde(rename = "arrayValue")]
      pub array_val: Option<ArrayValue>,
      #[serde(rename = "keyVauleList")]

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ fn collect_json_from_any_value(`
`47`	`47`	`if value.double_val.is_some() {`
`48`	`48`	`value_json.insert(`
`49`	`49`	`key.to_string(),`
`50`		`- Value::String(value.double_val.as_ref().unwrap().to_owned()),`
	`50`	`+ Value::Number(serde_json::Number::from_f64(value.double_val.unwrap()).unwrap()),`
`51`	`51`	`);`
`52`	`52`	`}`
`53`	`53`