diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index 5ccd430cc5..45899efeae 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -231,7 +231,40 @@ pub struct Project { hosted_project_id: Option, dev_server_project_id: Option, search_history: SearchHistory, - yarn_worktree_ids_reported: Vec, + telemetry_worktree_id_map: TelemetryWorktreeIdMap, +} + +#[derive(Debug)] +struct TelemetryWorktreeIdMap(HashMap); + +impl Default for TelemetryWorktreeIdMap { + fn default() -> Self { + Self(HashMap::from_iter([ + ( + "yarn.lock".to_string(), + ProjectTypeTelemetry::new("yarn".to_string()), + ), + ( + "package.json".to_string(), + ProjectTypeTelemetry::new("node".to_string()), + ), + ])) + } +} + +#[derive(Debug)] +struct ProjectTypeTelemetry { + name: String, + worktree_ids_reported: HashSet, +} + +impl ProjectTypeTelemetry { + fn new(name: String) -> Self { + Self { + name, + worktree_ids_reported: HashSet::default(), + } + } } pub enum LanguageServerToQuery { @@ -779,7 +812,7 @@ impl Project { hosted_project_id: None, dev_server_project_id: None, search_history: Self::new_search_history(), - yarn_worktree_ids_reported: Vec::new(), + telemetry_worktree_id_map: TelemetryWorktreeIdMap::default(), } }) } @@ -944,7 +977,7 @@ impl Project { .dev_server_project_id .map(|dev_server_project_id| DevServerProjectId(dev_server_project_id)), search_history: Self::new_search_history(), - yarn_worktree_ids_reported: Vec::new(), + telemetry_worktree_id_map: TelemetryWorktreeIdMap::default(), }; this.set_role(role, cx); for worktree in worktrees { @@ -7765,7 +7798,7 @@ impl Project { changes.clone(), )); - this.report_yarn_project(&worktree, changes, cx); + this.report_project_events(&worktree, changes, cx); } worktree::Event::UpdatedGitRepositories(updated_repos) => { if is_local { @@ -7818,7 +7851,7 @@ impl Project { self.metadata_changed(cx); } - fn report_yarn_project( + fn report_project_events( &mut self, worktree: &Model, updated_entries_set: &UpdatedEntriesSet, @@ -7826,21 +7859,37 @@ impl Project { ) { let worktree_id = worktree.update(cx, |worktree, _| worktree.id()); - if !self.yarn_worktree_ids_reported.contains(&worktree_id) { - let is_yarn_project = updated_entries_set.iter().any(|(path, _, _)| { + let client = self.client(); + + for (project_file_name, project_type_telemetry) in + self.telemetry_worktree_id_map.0.iter_mut() + { + if project_type_telemetry + .worktree_ids_reported + .contains(&worktree_id) + { + continue; + } + + let project_file_found = updated_entries_set.iter().any(|(path, _, _)| { path.as_ref() .file_name() .and_then(|name| name.to_str()) - .map(|name_str| name_str == "yarn.lock") + .map(|name_str| name_str == project_file_name) .unwrap_or(false) }); - if is_yarn_project { - self.client() - .telemetry() - .report_app_event("open yarn project".to_string()); - self.yarn_worktree_ids_reported.push(worktree_id); + if !project_file_found { + continue; } + + client + .telemetry() + .report_app_event(format!("open {} project", project_type_telemetry.name)); + + project_type_telemetry + .worktree_ids_reported + .insert(worktree_id); } }