feat: user-agent

Author: SSebo

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "feature_probe_mobile_sdk_core"
-version = "1.0.1"
+version = "1.0.2"
 
 [lib]
 name = "feature_probe_mobile_sdk_core"
@@ -34,7 +34,7 @@ tokio = { version = "1", features = ["full"] }
 tracing = "0.1"
 url = "2"
 
-feature-probe-event = { version = "1.0.1", features = ["use_tokio"], default-features = false }
+feature-probe-event = { version = "1.0.4", features = ["use_tokio"], default-features = false }
 
 [dev-dependencies]
 approx = "0.5"

rust-core/Cargo.toml

@@ -5,10 +5,13 @@ use feature_probe_event::event::AccessEvent;
 use feature_probe_event::recorder::{unix_timestamp, EventRecorder};
 use parking_lot::RwLock;
 use serde_json::Value;
+use std::env;
 use std::sync::Arc;
 use std::time::Duration;
 use url::Url;
 
+const VERSION: &str = env!("CARGO_PKG_VERSION");
+
 #[derive(Debug, Clone)]
 pub struct FeatureProbe {
     repo: Arc<RwLock<Repository>>,
@@ -117,20 +120,19 @@ impl FeatureProbe {
             None => FPDetail {
                 value: default,
                 reason: format!("Toggle {} not found", toggle),
-                rule_index: None,
-                version: None,
+                ..Default::default()
             },
             Some(d) => match transform(&d.value) {
                 None => FPDetail {
                     value: default,
                     reason: "Value type mismatch".to_owned(),
-                    rule_index: None,
-                    version: None,
+                    ..Default::default()
                 },
                 Some(v) => FPDetail {
                     value: v,
                     reason: d.reason.clone(),
                     rule_index: d.rule_index,
+                    variation_index: d.variation_index,
                     version: d.version,
                 },
             },
@@ -145,7 +147,7 @@ impl FeatureProbe {
             time: unix_timestamp(),
             key: toggle.to_owned(),
             value: value.clone(),
-            index: detail.rule_index,
+            index: detail.variation_index,
             version: detail.version,
             reason: detail.reason.clone(),
         });
@@ -174,11 +176,28 @@ impl FeatureProbe {
         let events_url = self.config.events_url.clone();
         let flush_interval = self.config.refresh_interval;
         let auth = SdkAuthorization(self.config.client_sdk_key.clone()).encode();
-        let event_recorder = EventRecorder::new(events_url, auth, flush_interval, 100);
+        let event_recorder =
+            EventRecorder::new(events_url, auth, user_agent(), flush_interval, 100);
+
         self.event_recorder = Some(event_recorder);
     }
 }
 
+fn user_agent() -> String {
+    let mut target_os = env::var("CARGO_CFG_TARGET_OS").unwrap_or("uniffi".to_owned());
+
+    if target_os.is_empty() {
+        target_os = "uniffi".to_owned();
+    }
+
+    if &target_os == "ios" {
+        target_os = "iOS".to_owned();
+    } else {
+        target_os = target_os[0..1].to_uppercase() + &target_os[1..];
+    }
+    format!("{}/{}", target_os, VERSION)
+}
+
 #[cfg(test)]
 mod tests {
     use serde_json::json;

rust-core/src/feature_probe.rs

@@ -20,6 +20,7 @@ pub type Repository = HashMap<String, FPDetail<Value>>;
 pub struct FPDetail<T: Default> {
     pub value: T,
     pub rule_index: Option<usize>,
+    pub variation_index: Option<usize>,
     pub version: Option<u64>,
     pub reason: String,
 }