feat(profiling): Add optional js profile to Android profiles events

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - `normalize_performance_score` stores 0 to 1 cdf score instead of weighted score for each performance score component. ([#2734](https://github.com/getsentry/relay/pull/2734))
 - Add Bytespider (Bytedance) to web crawler filter. ([#2747](https://github.com/getsentry/relay/pull/2747))
+- Add Mixed JS/Android Profiles events processing. ([#2706](https://github.com/getsentry/relay/pull/2706))
 
 **Bug Fixes**:
 

relay-profiling/src/android.rs

@@ -7,6 +7,8 @@ use relay_event_schema::protocol::EventId;
 use serde::{Deserialize, Serialize};
 
 use crate::measurements::Measurement;
+use crate::native_debug_image::NativeDebugImage;
+use crate::sample::Profile as SampleProfile;
 use crate::transaction_metadata::TransactionMetadata;
 use crate::utils::{deserialize_number_from_string, is_zero};
 use crate::{ProfileError, MAX_PROFILE_DURATION};
@@ -78,6 +80,9 @@ pub struct ProfileMetadata {
 
     #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     transaction_tags: BTreeMap<String, String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    debug_meta: Option<DebugMeta>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -88,10 +93,18 @@ struct AndroidProfile {
     #[serde(default, skip_serializing)]
     sampled_profile: String,
 
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    js_profile: Option<SampleProfile>,
+
     #[serde(default = "AndroidProfile::default")]
     profile: AndroidTraceLog,
 }
 
+#[derive(Default, Debug, Serialize, Deserialize, Clone)]
+struct DebugMeta {
+    images: Vec<NativeDebugImage>,
+}
+
 impl AndroidProfile {
     fn default() -> AndroidTraceLog {
         AndroidTraceLog {
@@ -158,6 +171,10 @@ fn parse_profile(payload: &[u8]) -> Result<AndroidProfile, ProfileError> {
         return Err(ProfileError::NoTransactionAssociated);
     }
 
+    if let Some(ref mut js_profile) = profile.js_profile {
+        js_profile.parse(profile.metadata.platform.as_str(), "")?;
+    }
+
     if !profile.sampled_profile.is_empty() {
         profile.parse()?;
     }
@@ -221,6 +238,17 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_roundtrip_react_native() {
+        let payload = include_bytes!("../tests/fixtures/profiles/android/roundtrip.rn.json");
+        let profile = parse_profile(payload);
+        assert!(profile.is_ok());
+        let data = serde_json::to_vec(&profile.unwrap());
+        assert!(
+            parse_android_profile(&(data.unwrap())[..], BTreeMap::new(), BTreeMap::new()).is_ok()
+        );
+    }
+
     #[test]
     fn test_no_transaction() {
         let payload = include_bytes!("../tests/fixtures/profiles/android/no_transaction.json");