diff --git a/Cargo.lock b/Cargo.lock index 5975f66a7eab3c..f8b7b6964994cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4375,6 +4375,7 @@ dependencies = [ "serde_json_lenient", "settings", "task", + "telemetry", "tempfile", "theme", "theme_extension", diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs index ffc2e6b53beb73..e92d4e2c5cd780 100644 --- a/crates/client/src/telemetry.rs +++ b/crates/client/src/telemetry.rs @@ -19,8 +19,8 @@ use std::time::Instant; use std::{env, mem, path::PathBuf, sync::Arc, time::Duration}; use telemetry_events::{ ActionEvent, AppEvent, AssistantEvent, CallEvent, EditEvent, Event, EventRequestBody, - EventWrapper, ExtensionEvent, InlineCompletionEvent, InlineCompletionRating, - InlineCompletionRatingEvent, ReplEvent, SettingEvent, + EventWrapper, InlineCompletionEvent, InlineCompletionRating, InlineCompletionRatingEvent, + ReplEvent, SettingEvent, }; use util::{ResultExt, TryFutureExt}; use worktree::{UpdatedEntriesSet, WorktreeId}; @@ -404,13 +404,6 @@ impl Telemetry { self.report_event(event) } - pub fn report_extension_event(self: &Arc, extension_id: Arc, version: Arc) { - self.report_event(Event::Extension(ExtensionEvent { - extension_id, - version, - })) - } - pub fn log_edit_event(self: &Arc, environment: &'static str, is_via_ssh: bool) { let mut state = self.state.lock(); let period_data = state.event_coalescer.log_event(environment); diff --git a/crates/extension_host/Cargo.toml b/crates/extension_host/Cargo.toml index 53971ade0a2fe0..b196733596171c 100644 --- a/crates/extension_host/Cargo.toml +++ b/crates/extension_host/Cargo.toml @@ -43,6 +43,7 @@ serde_json.workspace = true serde_json_lenient.workspace = true settings.workspace = true task.workspace = true +telemetry.workspace = true tempfile.workspace = true toml.workspace = true url.workspace = true diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs index 6c965d3d56810a..afe78e49a04592 100644 --- a/crates/extension_host/src/extension_host.rs +++ b/crates/extension_host/src/extension_host.rs @@ -1001,14 +1001,13 @@ impl ExtensionStore { extensions_to_unload.len() - reload_count ); - if let Some(telemetry) = &self.telemetry { - for extension_id in &extensions_to_load { - if let Some(extension) = new_index.extensions.get(extension_id) { - telemetry.report_extension_event( - extension_id.clone(), - extension.manifest.version.clone(), - ); - } + for extension_id in &extensions_to_load { + if let Some(extension) = new_index.extensions.get(extension_id) { + telemetry::event!( + "Extension Loaded", + extension_id, + version = extension.manifest.version + ); } }