Remove custom AttributeValue

fpx-lib/src/api/models/otel.rs

@@ -1,10 +1,8 @@
-use opentelemetry_proto::tonic::common::v1::{any_value, KeyValueList};
+use opentelemetry_proto::tonic::collector::trace::v1::ExportTraceServiceRequest;
+use opentelemetry_proto::tonic::common::v1::{AnyValue, KeyValue, KeyValueList};
 use opentelemetry_proto::tonic::trace::v1::span::{Event, Link};
 use opentelemetry_proto::tonic::trace::v1::status::StatusCode;
 use opentelemetry_proto::tonic::trace::v1::{span, Status};
-use opentelemetry_proto::tonic::{
-    collector::trace::v1::ExportTraceServiceRequest, common::v1::KeyValue,
-};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
@@ -231,7 +229,7 @@ impl From<StatusCode> for SpanStatusCode {
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, Default, PartialEq)]
-pub struct AttributeMap(pub BTreeMap<String, Option<AttributeValue>>);
+pub struct AttributeMap(pub BTreeMap<String, Option<AnyValue>>);
 
 impl From<KeyValueList> for AttributeMap {
     fn from(value: KeyValueList) -> Self {
@@ -241,52 +239,15 @@ impl From<KeyValueList> for AttributeMap {
 
 impl From<Vec<KeyValue>> for AttributeMap {
     fn from(attributes: Vec<KeyValue>) -> Self {
-        let result: BTreeMap<String, Option<AttributeValue>> = attributes
+        let result: BTreeMap<String, Option<AnyValue>> = attributes
             .into_iter()
-            .map(|kv| {
-                (
-                    kv.key,
-                    kv.value.and_then(|value| value.value.map(Into::into)),
-                )
-            })
+            .map(|kv| (kv.key, kv.value))
             .collect();
 
         AttributeMap(result)
     }
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub enum AttributeValue {
-    String(String),
-    Bool(bool),
-    Int(i64),
-    Double(f64),
-    Array(Vec<AttributeValue>),
-    KeyValueList(AttributeMap),
-    Bytes(Vec<u8>),
-}
-
-impl From<any_value::Value> for AttributeValue {
-    fn from(value: any_value::Value) -> Self {
-        match value {
-            any_value::Value::StringValue(val) => AttributeValue::String(val),
-            any_value::Value::BoolValue(val) => AttributeValue::Bool(val),
-            any_value::Value::IntValue(val) => AttributeValue::Int(val),
-            any_value::Value::DoubleValue(val) => AttributeValue::Double(val),
-            any_value::Value::BytesValue(val) => AttributeValue::Bytes(val),
-            any_value::Value::ArrayValue(val) => {
-                let val: Vec<_> = val
-                    .values
-                    .into_iter()
-                    .flat_map(|value| value.value.map(|value| value.into()))
-                    .collect();
-                AttributeValue::Array(val)
-            }
-            any_value::Value::KvlistValue(val) => AttributeValue::KeyValueList(val.values.into()),
-        }
-    }
-}
-
 /// A trace contains a summary of its traces.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct TraceSummary {

fpx-lib/src/data/util.rs

@@ -265,6 +265,7 @@ mod tests {
         )
     }
 
+    #[cfg(target_family = "wasm")]
     #[cfg(feature = "wasm-bindgen")]
     #[test]
     fn timestamp_serialize_wasm_bindgen() {

scripts/otel_collector/config.yaml

@@ -27,7 +27,7 @@ service:
   pipelines:
     traces:
       receivers: [otlp]
-      exporters: [debug, otlphttp/fpx-workers]
+      exporters: [debug, otlphttp]
 
   telemetry:
     logs: