Merge branch 'main' into add-release-channel-information-to-telemetry-events

This commit is contained in:
Joseph T Lyons 2022-10-27 15:57:17 -04:00
commit 36c64045ae
16 changed files with 42 additions and 220 deletions

View file

@ -102,15 +102,9 @@ impl AmplitudeTelemetry {
.unwrap()
.as_millis(),
state: Mutex::new(AmplitudeTelemetryState {
os_version: platform
.os_version()
.log_err()
.map(|v| v.to_string().into()),
os_version: platform.os_version().ok().map(|v| v.to_string().into()),
os_name: platform.os_name().into(),
app_version: platform
.app_version()
.log_err()
.map(|v| v.to_string().into()),
app_version: platform.app_version().ok().map(|v| v.to_string().into()),
release_channel,
device_id: None,
queue: Default::default(),

View file

@ -108,16 +108,9 @@ impl Telemetry {
http_client: client,
executor: cx.background().clone(),
state: Mutex::new(TelemetryState {
os_version: platform
.os_version()
.log_err()
.map(|v| v.to_string().into()),
os_version: platform.os_version().ok().map(|v| v.to_string().into()),
os_name: platform.os_name().into(),
app_version: platform
.app_version()
.log_err()
.map(|v| v.to_string().into()),
release_channel,
app_version: platform.app_version().ok().map(|v| v.to_string().into()),
device_id: None,
metrics_id: None,
queue: Default::default(),