zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 17:03:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

use installation_id over device_id

Browse Source
This commit is contained in:
Joseph T. Lyons 2023-05-01 16:29:51 -04:00 committed by GitHub
parent 5fb9d53dd0
commit f62ba2eec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
crates/client/src/telemetry.rs
View File

@ -30,13 +30,13 @@ pub struct Telemetry {
#[derive(Default)] #[derive(Default)]
struct TelemetryState { struct TelemetryState {
metrics_id: Option<Arc<str>>, metrics_id: Option<Arc<str>>, // Per logged-in user
device_id: Option<Arc<str>>, installation_id: Option<Arc<str>>, // Per app installation
app_version: Option<Arc<str>>, app_version: Option<Arc<str>>,
release_channel: Option<&'static str>, release_channel: Option<&'static str>,
os_version: Option<Arc<str>>, os_version: Option<Arc<str>>,
os_name: &'static str, os_name: &'static str,
mixpanel_events_queue: Vec<MixpanelEvent>, // Mixpanel mixed events - will hopefully die soon mixpanel_events_queue: Vec<MixpanelEvent>,
clickhouse_events_queue: Vec<ClickhouseEventWrapper>, clickhouse_events_queue: Vec<ClickhouseEventWrapper>,
next_mixpanel_event_id: usize, next_mixpanel_event_id: usize,
flush_mixpanel_events_task: Option<Task<()>>, flush_mixpanel_events_task: Option<Task<()>>,
@ -100,7 +100,8 @@ struct MixpanelEventProperties {
#[serde(skip_serializing_if = "str::is_empty")] #[serde(skip_serializing_if = "str::is_empty")]
token: &'static str, token: &'static str,
time: u128, time: u128,
distinct_id: Option<Arc<str>>, #[serde(rename = "distinct_id")]
installation_id: Option<Arc<str>>,
#[serde(rename = "$insert_id")] #[serde(rename = "$insert_id")]
insert_id: usize, insert_id: usize,
// Custom fields // Custom fields
@ -123,7 +124,7 @@ struct MixpanelEngageRequest {
#[serde(rename = "$token")] #[serde(rename = "$token")]
token: &'static str, token: &'static str,
#[serde(rename = "$distinct_id")] #[serde(rename = "$distinct_id")]
distinct_id: Arc<str>, installation_id: Arc<str>,
#[serde(rename = "$set")] #[serde(rename = "$set")]
set: Value, set: Value,
} }
@ -156,7 +157,7 @@ impl Telemetry {
os_name: platform.os_name().into(), os_name: platform.os_name().into(),
app_version: platform.app_version().ok().map(|v| v.to_string().into()), app_version: platform.app_version().ok().map(|v| v.to_string().into()),
release_channel, release_channel,
device_id: None, installation_id: None,
metrics_id: None, metrics_id: None,
mixpanel_events_queue: Default::default(), mixpanel_events_queue: Default::default(),
clickhouse_events_queue: Default::default(), clickhouse_events_queue: Default::default(),
@ -193,26 +194,26 @@ impl Telemetry {
self.executor self.executor
.spawn( .spawn(
async move { async move {
let device_id = let installation_id =
if let Ok(Some(device_id)) = KEY_VALUE_STORE.read_kvp("device_id") { if let Ok(Some(installation_id)) = KEY_VALUE_STORE.read_kvp("device_id") {
device_id installation_id
} else { } else {
let device_id = Uuid::new_v4().to_string(); let installation_id = Uuid::new_v4().to_string();
KEY_VALUE_STORE KEY_VALUE_STORE
.write_kvp("device_id".to_string(), device_id.clone()) .write_kvp("device_id".to_string(), installation_id.clone())
.await?; .await?;
device_id installation_id
}; };
let device_id: Arc<str> = device_id.into(); let installation_id: Arc<str> = installation_id.into();
let mut state = this.state.lock(); let mut state = this.state.lock();
state.device_id = Some(device_id.clone()); state.installation_id = Some(installation_id.clone());
for event in &mut state.mixpanel_events_queue { for event in &mut state.mixpanel_events_queue {
event event
.properties .properties
.distinct_id .installation_id
.get_or_insert_with(|| device_id.clone()); .get_or_insert_with(|| installation_id.clone());
} }
let has_mixpanel_events = !state.mixpanel_events_queue.is_empty(); let has_mixpanel_events = !state.mixpanel_events_queue.is_empty();
@ -248,19 +249,19 @@ impl Telemetry {
let this = self.clone(); let this = self.clone();
let mut state = self.state.lock(); let mut state = self.state.lock();
let device_id = state.device_id.clone(); let installation_id = state.installation_id.clone();
let metrics_id: Option<Arc<str>> = metrics_id.map(|id| id.into()); let metrics_id: Option<Arc<str>> = metrics_id.map(|id| id.into());
state.metrics_id = metrics_id.clone(); state.metrics_id = metrics_id.clone();
state.is_staff = Some(is_staff); state.is_staff = Some(is_staff);
drop(state); drop(state);
if let Some((token, device_id)) = MIXPANEL_TOKEN.as_ref().zip(device_id) { if let Some((token, installation_id)) = MIXPANEL_TOKEN.as_ref().zip(installation_id) {
self.executor self.executor
.spawn( .spawn(
async move { async move {
let json_bytes = serde_json::to_vec(&[MixpanelEngageRequest { let json_bytes = serde_json::to_vec(&[MixpanelEngageRequest {
token, token,
distinct_id: device_id, installation_id,
set: json!({ set: json!({
"Staff": is_staff, "Staff": is_staff,
"ID": metrics_id, "ID": metrics_id,
@ -299,7 +300,7 @@ impl Telemetry {
event, event,
}); });
if state.device_id.is_some() { if state.installation_id.is_some() {
if state.mixpanel_events_queue.len() >= MAX_QUEUE_LEN { if state.mixpanel_events_queue.len() >= MAX_QUEUE_LEN {
drop(state); drop(state);
self.flush_clickhouse_events(); self.flush_clickhouse_events();
@ -333,7 +334,7 @@ impl Telemetry {
.duration_since(UNIX_EPOCH) .duration_since(UNIX_EPOCH)
.unwrap() .unwrap()
.as_millis(), .as_millis(),
distinct_id: state.device_id.clone(), installation_id: state.installation_id.clone(),
insert_id: post_inc(&mut state.next_mixpanel_event_id), insert_id: post_inc(&mut state.next_mixpanel_event_id),
event_properties: if let Value::Object(properties) = properties { event_properties: if let Value::Object(properties) = properties {
Some(properties) Some(properties)
@ -348,7 +349,7 @@ impl Telemetry {
}, },
}; };
state.mixpanel_events_queue.push(event); state.mixpanel_events_queue.push(event);
if state.device_id.is_some() { if state.installation_id.is_some() {
if state.mixpanel_events_queue.len() >= MAX_QUEUE_LEN { if state.mixpanel_events_queue.len() >= MAX_QUEUE_LEN {
drop(state); drop(state);
self.flush_mixpanel_events(); self.flush_mixpanel_events();
@ -367,6 +368,10 @@ impl Telemetry {
self.state.lock().metrics_id.clone() self.state.lock().metrics_id.clone()
} }
pub fn installation_id(self: &Arc<Self>) -> Option<Arc<str>> {
self.state.lock().installation_id.clone()
}
pub fn is_staff(self: &Arc<Self>) -> Option<bool> { pub fn is_staff(self: &Arc<Self>) -> Option<bool> {
self.state.lock().is_staff self.state.lock().is_staff
} }
@ -438,7 +443,7 @@ impl Telemetry {
&mut json_bytes, &mut json_bytes,
&ClickhouseEventRequestBody { &ClickhouseEventRequestBody {
token: ZED_SECRET_CLIENT_TOKEN, token: ZED_SECRET_CLIENT_TOKEN,
installation_id: state.device_id.clone(), installation_id: state.installation_id.clone(),
app_version: state.app_version.clone(), app_version: state.app_version.clone(),
os_name: state.os_name, os_name: state.os_name,
os_version: state.os_version.clone(), os_version: state.os_version.clone(),

3
crates/feedback/src/feedback_editor.rs
View File

@ -47,6 +47,7 @@ pub fn init(cx: &mut AppContext) {
struct FeedbackRequestBody<'a> { struct FeedbackRequestBody<'a> {
feedback_text: &'a str, feedback_text: &'a str,
metrics_id: Option<Arc<str>>, metrics_id: Option<Arc<str>>,
installation_id: Option<Arc<str>>,
system_specs: SystemSpecs, system_specs: SystemSpecs,
is_staff: bool, is_staff: bool,
token: &'a str, token: &'a str,
@ -152,12 +153,14 @@ impl FeedbackEditor {
let telemetry = zed_client.telemetry(); let telemetry = zed_client.telemetry();
let metrics_id = telemetry.metrics_id(); let metrics_id = telemetry.metrics_id();
let installation_id = telemetry.installation_id();
let is_staff = telemetry.is_staff(); let is_staff = telemetry.is_staff();
let http_client = zed_client.http_client(); let http_client = zed_client.http_client();
let request = FeedbackRequestBody { let request = FeedbackRequestBody {
feedback_text: &feedback_text, feedback_text: &feedback_text,
metrics_id, metrics_id,
installation_id,
system_specs, system_specs,
is_staff: is_staff.unwrap_or(false), is_staff: is_staff.unwrap_or(false),
token: ZED_SECRET_CLIENT_TOKEN, token: ZED_SECRET_CLIENT_TOKEN,