update known attribute list

Author: nikhilsinhaparseable

src/otel/logs.rs

@@ -35,7 +35,6 @@ pub const OTEL_LOG_KNOWN_FIELD_LIST: [&str; 6] = [
     "span_id",
     "trace_id",
 ];
-
 /// otel log event has severity number
 /// there is a mapping of severity number to severity text provided in proto
 /// this function fetches the severity text from the severity number
@@ -182,11 +181,17 @@ pub fn flatten_otel_logs(message: &LogsData) -> Vec<Value> {
         vec_otel_json.extend(vec_resource_logs_json);
     }
     // Add common attributes as one attribute in stringified array to each log record
+    let other_attributes = match serde_json::to_string(&other_attributes) {
+        Ok(s) => s,
+        Err(e) => {
+            tracing::warn!("failed to serialise OTEL other_attributes: {e}");
+            String::new()
+        }
+    };
     for log_record_json in &mut vec_otel_json {
-        let other_attributes = serde_json::to_string(&other_attributes).unwrap();
         log_record_json.insert(
             "other_attributes".to_string(),
-            Value::String(other_attributes),
+            Value::String(other_attributes.clone()),
         );
     }
     vec_otel_json.into_iter().map(Value::Object).collect()

src/otel/metrics.rs

@@ -548,12 +548,18 @@ pub fn flatten_otel_metrics(message: MetricsData) -> Vec<Value> {
         }
         vec_otel_json.extend(vec_scope_metrics_json);
     }
-    // Add common attributes as one attribute in stringified array to each log record
-    for log_record_json in &mut vec_otel_json {
-        let other_attributes_json_string = serde_json::to_string(&other_attributes).unwrap();
-        log_record_json.insert(
+    // Add common attributes as one attribute in stringified array to each metric record
+    let other_attributes = match serde_json::to_string(&other_attributes) {
+        Ok(s) => s,
+        Err(e) => {
+            tracing::warn!("failed to serialise OTEL other_attributes: {e}");
+            String::new()
+        }
+    };
+    for metric_record_json in &mut vec_otel_json {
+        metric_record_json.insert(
             "other_attributes".to_string(),
-            Value::String(other_attributes_json_string),
+            Value::String(other_attributes.clone()),
         );
     }
     vec_otel_json.into_iter().map(Value::Object).collect()

src/otel/otel_utils.rs

@@ -22,7 +22,7 @@ use opentelemetry_proto::tonic::common::v1::{
 };
 use serde_json::{Map, Value};
 
-const KNOWN_ATTRIBUTES_PREFIX: [&str; 3] = ["http", "url", "service"];
+const KNOWN_ATTRIBUTES_PREFIX: [&str; 6] = ["http", "url", "service", "os", "host", "telemetry"];
 
 // Value can be one of types - String, Bool, Int, Double, ArrayValue, AnyValue, KeyValueList, Byte
 pub fn collect_json_from_value(key: &String, value: OtelValue) -> Map<String, Value> {

src/otel/traces.rs

@@ -126,12 +126,18 @@ pub fn flatten_otel_traces(message: &TracesData) -> Vec<Value> {
 
         vec_otel_json.extend(vec_resource_spans_json);
     }
-    // Add common attributes as one attribute in stringified array to each log record
-    for log_record_json in &mut vec_otel_json {
-        let other_attributes = serde_json::to_string(&other_attributes).unwrap();
-        log_record_json.insert(
+    // Add common attributes as one attribute in stringified array to each span record
+    let other_attributes = match serde_json::to_string(&other_attributes) {
+        Ok(s) => s,
+        Err(e) => {
+            tracing::warn!("failed to serialise OTEL other_attributes: {e}");
+            String::new()
+        }
+    };
+    for span_record_json in &mut vec_otel_json {
+        span_record_json.insert(
             "other_attributes".to_string(),
-            Value::String(other_attributes),
+            Value::String(other_attributes.clone()),
         );
     }
     vec_otel_json.into_iter().map(Value::Object).collect()