fix(telemetry)!: fix logs payload format [APMSP-2590]

bin_tests/tests/crashtracker_bin_test.rs

@@ -1070,9 +1070,15 @@ fn assert_telemetry_message(crash_telemetry: &[u8], crash_typ: &str) {
         }),
         telemetry_payload["application"]
     );
-    assert_eq!(telemetry_payload["payload"].as_array().unwrap().len(), 1);
+    assert_eq!(
+        telemetry_payload["payload"]["logs"]
+            .as_array()
+            .unwrap()
+            .len(),
+        1
+    );
 
-    let log_entry = &telemetry_payload["payload"][0];
+    let log_entry = &telemetry_payload["payload"]["logs"][0];
     let tags_raw = log_entry["tags"].as_str().unwrap();
     let is_crash_ping = tags_raw.contains("is_crash_ping:true");
 
@@ -1523,9 +1529,15 @@ fn assert_crash_ping_message(body: &str) {
         serde_json::from_str(body).expect("Crash ping should be valid JSON");
 
     assert_eq!(telemetry_payload["request_type"], "logs");
-    assert_eq!(telemetry_payload["payload"].as_array().unwrap().len(), 1);
+    assert_eq!(
+        telemetry_payload["payload"]["logs"]
+            .as_array()
+            .unwrap()
+            .len(),
+        1
+    );
 
-    let log_entry = &telemetry_payload["payload"][0];
+    let log_entry = &telemetry_payload["payload"]["logs"][0];
 
     let tags = log_entry["tags"].as_str().unwrap();
     assert!(

libdd-crashtracker/src/crash_info/telemetry.rs

@@ -315,15 +315,17 @@ impl TelemetryCrashUploader {
             seq_id: 1,
             application: &self.metadata.application,
             host: &self.metadata.host,
-            payload: &data::Payload::Logs(vec![data::Log {
-                message,
-                level,
-                stack_trace: None,
-                tags,
-                is_sensitive,
-                count: 1,
-                is_crash,
-            }]),
+            payload: &data::Payload::Logs(data::Logs {
+                logs: vec![data::Log {
+                    message,
+                    level,
+                    stack_trace: None,
+                    tags,
+                    is_sensitive,
+                    count: 1,
+                    is_crash,
+                }],
+            }),
             origin: Some("Crashtracker"),
         };
 
@@ -503,8 +505,8 @@ mod tests {
         assert_eq!(payload["tracer_time"], 1568898000);
         assert_eq!(payload["origin"], "Crashtracker");
 
-        assert_eq!(payload["payload"].as_array().unwrap().len(), 1);
-        let tags = payload["payload"][0]["tags"]
+        assert_eq!(payload["payload"]["logs"].as_array().unwrap().len(), 1);
+        let tags = payload["payload"]["logs"][0]["tags"]
             .as_str()
             .unwrap()
             .split(',')
@@ -525,12 +527,12 @@ mod tests {
             ]),
             tags
         );
-        assert_eq!(payload["payload"][0]["is_sensitive"], true);
-        assert_eq!(payload["payload"][0]["level"], "ERROR");
+        assert_eq!(payload["payload"]["logs"][0]["is_sensitive"], true);
+        assert_eq!(payload["payload"]["logs"][0]["level"], "ERROR");
         let body: CrashInfo =
-            serde_json::from_str(payload["payload"][0]["message"].as_str().unwrap())?;
+            serde_json::from_str(payload["payload"]["logs"][0]["message"].as_str().unwrap())?;
         assert_eq!(body, test_instance);
-        assert_eq!(payload["payload"][0]["is_crash"], true);
+        assert_eq!(payload["payload"]["logs"][0]["is_crash"], true);
         Ok(())
     }
 
@@ -569,8 +571,8 @@ mod tests {
         assert_eq!(payload["request_type"], "logs");
         assert_eq!(payload["origin"], "Crashtracker");
 
-        assert_eq!(payload["payload"].as_array().unwrap().len(), 1);
-        let log_entry = &payload["payload"][0];
+        assert_eq!(payload["payload"]["logs"].as_array().unwrap().len(), 1);
+        let log_entry = &payload["payload"]["logs"][0];
 
         // Crash ping properties
         assert_eq!(log_entry["is_sensitive"], false);
@@ -644,8 +646,8 @@ mod tests {
         assert_eq!(payload["request_type"], "logs");
         assert_eq!(payload["origin"], "Crashtracker");
 
-        assert_eq!(payload["payload"].as_array().unwrap().len(), 1);
-        let log_entry = &payload["payload"][0];
+        assert_eq!(payload["payload"]["logs"].as_array().unwrap().len(), 1);
+        let log_entry = &payload["payload"]["logs"][0];
 
         // Crash ping properties
         assert_eq!(log_entry["is_crash"], false);
@@ -748,7 +750,7 @@ mod tests {
         assert_eq!(payload["request_type"], "logs");
         assert_eq!(payload["origin"], "Crashtracker");
 
-        let log_entry = &payload["payload"][0];
+        let log_entry = &payload["payload"]["logs"][0];
         assert_eq!(log_entry["level"], "DEBUG");
         assert_eq!(log_entry["is_sensitive"], false);
         assert_eq!(log_entry["is_crash"], false);
@@ -907,7 +909,7 @@ mod tests {
         assert_eq!(payload["request_type"], "logs");
         assert_eq!(payload["origin"], "Crashtracker");
 
-        let log_entry = &payload["payload"][0];
+        let log_entry = &payload["payload"]["logs"][0];
         assert_eq!(log_entry["level"], "DEBUG");
         assert_eq!(log_entry["is_sensitive"], false);
         assert_eq!(log_entry["is_crash"], false);
@@ -977,7 +979,7 @@ mod tests {
         assert_eq!(payload["request_type"], "logs");
         assert_eq!(payload["origin"], "Crashtracker");
 
-        let log_entry = &payload["payload"][0];
+        let log_entry = &payload["payload"]["logs"][0];
         assert_eq!(log_entry["level"], "WARN");
         assert_eq!(log_entry["is_sensitive"], false);
         assert_eq!(log_entry["is_crash"], false);

libdd-telemetry/examples/tm-ping.rs

@@ -31,7 +31,7 @@ fn build_request<'a>(
     payload: &'a data::Payload,
 ) -> data::Telemetry<'a> {
     data::Telemetry {
-        api_version: data::ApiVersion::V1,
+        api_version: data::ApiVersion::V2,
         tracer_time: SystemTime::UNIX_EPOCH.elapsed().map_or(0, |d| d.as_secs()),
         runtime_id: "runtime_id",
         seq_id: seq_id(),

libdd-telemetry/examples/tm-send-sketch.rs

@@ -29,7 +29,7 @@ fn build_request<'a>(
     payload: &'a data::Payload,
 ) -> data::Telemetry<'a> {
     data::Telemetry {
-        api_version: data::ApiVersion::V1,
+        api_version: data::ApiVersion::V2,
         tracer_time: SystemTime::UNIX_EPOCH.elapsed().map_or(0, |d| d.as_secs()),
         runtime_id: "runtime_id",
         seq_id: seq_id(),

libdd-telemetry/src/data/common.rs

@@ -7,16 +7,13 @@ use crate::data::*;
 
 #[derive(Serialize, Deserialize, Debug)]
 pub enum ApiVersion {
-    #[serde(rename = "v1")]
-    V1,
     #[serde(rename = "v2")]
     V2,
 }
 
 impl ApiVersion {
     pub fn to_str(&self) -> &'static str {
         match self {
-            ApiVersion::V1 => "v1",
             ApiVersion::V2 => "v2",
         }
     }