Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Joseph T. Lyons 2024-01-06 14:41:35 -05:00
parent 3d1f522566
commit cdd5cb16ed
14 changed files with 348 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/assistant/src/assistant_panel.rs
View file

@ -3542,5 +3542,5 @@ fn report_assistant_event(
.default_open_ai_model .default_open_ai_model
.clone(); .clone();
telemetry.report_assistant_event(conversation_id, assistant_kind, model.full_name(), cx) telemetry.report_assistant_event(conversation_id, assistant_kind, model.full_name())
} }

16
crates/call/src/call.rs
View file

@ -310,14 +310,14 @@ impl ActiveCall {
}) })
} }
pub fn decline_incoming(&mut self, cx: &mut ModelContext<Self>) -> Result<()> { pub fn decline_incoming(&mut self, _cx: &mut ModelContext<Self>) -> Result<()> {
let call = self let call = self
.incoming_call .incoming_call
.0 .0
.borrow_mut() .borrow_mut()
.take() .take()
.ok_or_else(|| anyhow!("no incoming call"))?; .ok_or_else(|| anyhow!("no incoming call"))?;
report_call_event_for_room("decline incoming", call.room_id, None, &self.client, cx); report_call_event_for_room("decline incoming", call.room_id, None, &self.client);
self.client.send(proto::DeclineCall { self.client.send(proto::DeclineCall {
room_id: call.room_id, room_id: call.room_id,
})?; })?;
@ -467,7 +467,7 @@ impl ActiveCall {
pub fn report_call_event(&self, operation: &'static str, cx: &mut AppContext) { pub fn report_call_event(&self, operation: &'static str, cx: &mut AppContext) {
if let Some(room) = self.room() { if let Some(room) = self.room() {
let room = room.read(cx); let room = room.read(cx);
report_call_event_for_room(operation, room.id(), room.channel_id(), &self.client, cx); report_call_event_for_room(operation, room.id(), room.channel_id(), &self.client);
} }
} }
} }
@ -477,11 +477,10 @@ pub fn report_call_event_for_room(
room_id: u64, room_id: u64,
channel_id: Option<u64>, channel_id: Option<u64>,
client: &Arc<Client>, client: &Arc<Client>,
cx: &mut AppContext,
) { ) {
let telemetry = client.telemetry(); let telemetry = client.telemetry();
telemetry.report_call_event(operation, Some(room_id), channel_id, cx) telemetry.report_call_event(operation, Some(room_id), channel_id)
} }
pub fn report_call_event_for_channel( pub fn report_call_event_for_channel(
@ -494,12 +493,7 @@ pub fn report_call_event_for_channel(
let telemetry = client.telemetry(); let telemetry = client.telemetry();
telemetry.report_call_event( telemetry.report_call_event(operation, room.map(|r| r.read(cx).id()), Some(channel_id))
operation,
room.map(|r| r.read(cx).id()),
Some(channel_id),
cx,
)
} }
#[cfg(test)] #[cfg(test)]

3
crates/client/src/client.rs
View file

@ -501,8 +501,7 @@ impl Client {
})); }));
} }
Status::SignedOut | Status::UpgradeRequired => { Status::SignedOut | Status::UpgradeRequired => {
cx.update(|cx| self.telemetry.set_authenticated_user_info(None, false, cx)) self.telemetry.set_authenticated_user_info(None, false);
.log_err();
state._reconnect_task.take(); state._reconnect_task.take();
} }
_ => {} _ => {}

123
crates/client/src/telemetry.rs
View file

@ -5,7 +5,7 @@ use gpui::{serde_json, AppContext, AppMetadata, BackgroundExecutor, Task};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use parking_lot::Mutex; use parking_lot::Mutex;
use serde::Serialize; use serde::Serialize;
use settings::Settings; use settings::{Settings, SettingsStore};
use std::{env, io::Write, mem, path::PathBuf, sync::Arc, time::Duration}; use std::{env, io::Write, mem, path::PathBuf, sync::Arc, time::Duration};
use sysinfo::{ use sysinfo::{
CpuRefreshKind, Pid, PidExt, ProcessExt, ProcessRefreshKind, RefreshKind, System, SystemExt, CpuRefreshKind, Pid, PidExt, ProcessExt, ProcessRefreshKind, RefreshKind, System, SystemExt,
@ -17,10 +17,11 @@ use util::{channel::ReleaseChannel, TryFutureExt};
pub struct Telemetry { pub struct Telemetry {
http_client: Arc<dyn HttpClient>, http_client: Arc<dyn HttpClient>,
executor: BackgroundExecutor, executor: BackgroundExecutor,
state: Mutex<TelemetryState>, state: Arc<Mutex<TelemetryState>>,
} }
struct TelemetryState { struct TelemetryState {
settings: TelemetrySettings,
metrics_id: Option<Arc<str>>, // Per logged-in user metrics_id: Option<Arc<str>>, // Per logged-in user
installation_id: Option<Arc<str>>, // Per app installation (different for dev, nightly, preview, and stable) installation_id: Option<Arc<str>>, // Per app installation (different for dev, nightly, preview, and stable)
session_id: Option<Arc<str>>, // Per app launch session_id: Option<Arc<str>>, // Per app launch
@ -139,45 +140,60 @@ impl Telemetry {
None None
}; };
TelemetrySettings::register(cx);
let state = Arc::new(Mutex::new(TelemetryState {
settings: TelemetrySettings::get_global(cx).clone(),
app_metadata: cx.app_metadata(),
architecture: env::consts::ARCH,
release_channel,
installation_id: None,
metrics_id: None,
session_id: None,
clickhouse_events_queue: Default::default(),
flush_clickhouse_events_task: Default::default(),
log_file: None,
is_staff: None,
first_event_datetime: None,
}));
cx.observe_global::<SettingsStore>({
let state = state.clone();
move |cx| {
let mut state = state.lock();
state.settings = TelemetrySettings::get_global(cx).clone();
}
})
.detach();
// TODO: Replace all hardware stuff with nested SystemSpecs json // TODO: Replace all hardware stuff with nested SystemSpecs json
let this = Arc::new(Self { let this = Arc::new(Self {
http_client: client, http_client: client,
executor: cx.background_executor().clone(), executor: cx.background_executor().clone(),
state: Mutex::new(TelemetryState { state,
app_metadata: cx.app_metadata(),
architecture: env::consts::ARCH,
release_channel,
installation_id: None,
metrics_id: None,
session_id: None,
clickhouse_events_queue: Default::default(),
flush_clickhouse_events_task: Default::default(),
log_file: None,
is_staff: None,
first_event_datetime: None,
}),
}); });
// We should only ever have one instance of Telemetry, leak the subscription to keep it alive // We should only ever have one instance of Telemetry, leak the subscription to keep it alive
// rather than store in TelemetryState, complicating spawn as subscriptions are not Send // rather than store in TelemetryState, complicating spawn as subscriptions are not Send
std::mem::forget(cx.on_app_quit({ std::mem::forget(cx.on_app_quit({
let this = this.clone(); let this = this.clone();
move |cx| this.shutdown_telemetry(cx) move |_| this.shutdown_telemetry()
})); }));
this this
} }
#[cfg(any(test, feature = "test-support"))] #[cfg(any(test, feature = "test-support"))]
fn shutdown_telemetry(self: &Arc<Self>, _: &mut AppContext) -> impl Future<Output = ()> { fn shutdown_telemetry(self: &Arc<Self>) -> impl Future<Output = ()> {
Task::ready(()) Task::ready(())
} }
// Skip calling this function in tests. // Skip calling this function in tests.
// TestAppContext ends up calling this function on shutdown and it panics when trying to find the TelemetrySettings // TestAppContext ends up calling this function on shutdown and it panics when trying to find the TelemetrySettings
#[cfg(not(any(test, feature = "test-support")))] #[cfg(not(any(test, feature = "test-support")))]
fn shutdown_telemetry(self: &Arc<Self>, cx: &mut AppContext) -> impl Future<Output = ()> { fn shutdown_telemetry(self: &Arc<Self>) -> impl Future<Output = ()> {
self.report_app_event("close", true, cx); self.report_app_event("close", true);
Task::ready(()) Task::ready(())
} }
@ -197,7 +213,7 @@ impl Telemetry {
drop(state); drop(state);
let this = self.clone(); let this = self.clone();
cx.spawn(|cx| async move { cx.spawn(|_cx| async move {
// Avoiding calling `System::new_all()`, as there have been crashes related to it // Avoiding calling `System::new_all()`, as there have been crashes related to it
let refresh_kind = RefreshKind::new() let refresh_kind = RefreshKind::new()
.with_memory() // For memory usage .with_memory() // For memory usage
@ -226,11 +242,8 @@ impl Telemetry {
return; return;
}; };
cx.update(|cx| { this.report_memory_event(process.memory(), process.virtual_memory());
this.report_memory_event(process.memory(), process.virtual_memory(), cx); this.report_cpu_event(process.cpu_usage(), system.cpus().len() as u32);
this.report_cpu_event(process.cpu_usage(), system.cpus().len() as u32, cx);
})
.ok();
} }
}) })
.detach(); .detach();
@ -240,13 +253,13 @@ impl Telemetry {
self: &Arc<Self>, self: &Arc<Self>,
metrics_id: Option<String>, metrics_id: Option<String>,
is_staff: bool, is_staff: bool,
cx: &AppContext,
) { ) {
if !TelemetrySettings::get_global(cx).metrics { let mut state = self.state.lock();
if !state.settings.metrics {
return; return;
} }
let mut state = self.state.lock();
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);
@ -260,7 +273,6 @@ impl Telemetry {
operation: &'static str, operation: &'static str,
copilot_enabled: bool, copilot_enabled: bool,
copilot_enabled_for_language: bool, copilot_enabled_for_language: bool,
cx: &AppContext,
) { ) {
let event = ClickhouseEvent::Editor { let event = ClickhouseEvent::Editor {
file_extension, file_extension,
@ -271,7 +283,7 @@ impl Telemetry {
milliseconds_since_first_event: self.milliseconds_since_first_event(), milliseconds_since_first_event: self.milliseconds_since_first_event(),
}; };
self.report_clickhouse_event(event, false, cx) self.report_clickhouse_event(event, false)
} }
pub fn report_copilot_event( pub fn report_copilot_event(
@ -279,7 +291,6 @@ impl Telemetry {
suggestion_id: Option<String>, suggestion_id: Option<String>,
suggestion_accepted: bool, suggestion_accepted: bool,
file_extension: Option<String>, file_extension: Option<String>,
cx: &AppContext,
) { ) {
let event = ClickhouseEvent::Copilot { let event = ClickhouseEvent::Copilot {
suggestion_id, suggestion_id,
@ -288,7 +299,7 @@ impl Telemetry {
milliseconds_since_first_event: self.milliseconds_since_first_event(), milliseconds_since_first_event: self.milliseconds_since_first_event(),
}; };
self.report_clickhouse_event(event, false, cx) self.report_clickhouse_event(event, false)
} }
pub fn report_assistant_event( pub fn report_assistant_event(
@ -296,7 +307,6 @@ impl Telemetry {
conversation_id: Option<String>, conversation_id: Option<String>,
kind: AssistantKind, kind: AssistantKind,
model: &'static str, model: &'static str,
cx: &AppContext,
) { ) {
let event = ClickhouseEvent::Assistant { let event = ClickhouseEvent::Assistant {
conversation_id, conversation_id,
@ -305,7 +315,7 @@ impl Telemetry {
milliseconds_since_first_event: self.milliseconds_since_first_event(), milliseconds_since_first_event: self.milliseconds_since_first_event(),
}; };
self.report_clickhouse_event(event, false, cx) self.report_clickhouse_event(event, false)
} }
pub fn report_call_event( pub fn report_call_event(
@ -313,7 +323,6 @@ impl Telemetry {
operation: &'static str, operation: &'static str,
room_id: Option<u64>, room_id: Option<u64>,
channel_id: Option<u64>, channel_id: Option<u64>,
cx: &AppContext,
) { ) {
let event = ClickhouseEvent::Call { let event = ClickhouseEvent::Call {
operation, operation,
@ -322,29 +331,23 @@ impl Telemetry {
milliseconds_since_first_event: self.milliseconds_since_first_event(), milliseconds_since_first_event: self.milliseconds_since_first_event(),
}; };
self.report_clickhouse_event(event, false, cx) self.report_clickhouse_event(event, false)
} }
pub fn report_cpu_event( pub fn report_cpu_event(self: &Arc<Self>, usage_as_percentage: f32, core_count: u32) {
self: &Arc<Self>,
usage_as_percentage: f32,
core_count: u32,
cx: &AppContext,
) {
let event = ClickhouseEvent::Cpu { let event = ClickhouseEvent::Cpu {
usage_as_percentage, usage_as_percentage,
core_count, core_count,
milliseconds_since_first_event: self.milliseconds_since_first_event(), milliseconds_since_first_event: self.milliseconds_since_first_event(),
}; };
self.report_clickhouse_event(event, false, cx) self.report_clickhouse_event(event, false)
} }
pub fn report_memory_event( pub fn report_memory_event(
self: &Arc<Self>, self: &Arc<Self>,
memory_in_bytes: u64, memory_in_bytes: u64,
virtual_memory_in_bytes: u64, virtual_memory_in_bytes: u64,
cx: &AppContext,
) { ) {
let event = ClickhouseEvent::Memory { let event = ClickhouseEvent::Memory {
memory_in_bytes, memory_in_bytes,
@ -352,36 +355,26 @@ impl Telemetry {
milliseconds_since_first_event: self.milliseconds_since_first_event(), milliseconds_since_first_event: self.milliseconds_since_first_event(),
}; };
self.report_clickhouse_event(event, false, cx) self.report_clickhouse_event(event, false)
} }
pub fn report_app_event( pub fn report_app_event(self: &Arc<Self>, operation: &'static str, immediate_flush: bool) {
self: &Arc<Self>,
operation: &'static str,
immediate_flush: bool,
cx: &AppContext,
) {
let event = ClickhouseEvent::App { let event = ClickhouseEvent::App {
operation, operation,
milliseconds_since_first_event: self.milliseconds_since_first_event(), milliseconds_since_first_event: self.milliseconds_since_first_event(),
}; };
self.report_clickhouse_event(event, immediate_flush, cx) self.report_clickhouse_event(event, immediate_flush)
} }
pub fn report_setting_event( pub fn report_setting_event(self: &Arc<Self>, setting: &'static str, value: String) {
self: &Arc<Self>,
setting: &'static str,
value: String,
cx: &AppContext,
) {
let event = ClickhouseEvent::Setting { let event = ClickhouseEvent::Setting {
setting, setting,
value, value,
milliseconds_since_first_event: self.milliseconds_since_first_event(), milliseconds_since_first_event: self.milliseconds_since_first_event(),
}; };
self.report_clickhouse_event(event, false, cx) self.report_clickhouse_event(event, false)
} }
fn milliseconds_since_first_event(&self) -> i64 { fn milliseconds_since_first_event(&self) -> i64 {
@ -398,17 +391,13 @@ impl Telemetry {
} }
} }
fn report_clickhouse_event( fn report_clickhouse_event(self: &Arc<Self>, event: ClickhouseEvent, immediate_flush: bool) {
self: &Arc<Self>, let mut state = self.state.lock();
event: ClickhouseEvent,
immediate_flush: bool, if !state.settings.metrics {
cx: &AppContext,
) {
if !TelemetrySettings::get_global(cx).metrics {
return; return;
} }
let mut state = self.state.lock();
let signed_in = state.metrics_id.is_some(); let signed_in = state.metrics_id.is_some();
state state
.clickhouse_events_queue .clickhouse_events_queue

1
crates/client/src/user.rs
View file

@ -164,7 +164,6 @@ impl UserStore {
client.telemetry.set_authenticated_user_info( client.telemetry.set_authenticated_user_info(
Some(info.metrics_id.clone()), Some(info.metrics_id.clone()),
info.staff, info.staff,
cx,
) )
} }
})?; })?;

4
crates/collab_ui/src/collab_ui.rs
View file

@ -58,7 +58,6 @@ pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut AppContext) {
room.id(), room.id(),
room.channel_id(), room.channel_id(),
&client, &client,
cx,
); );
Task::ready(room.unshare_screen(cx)) Task::ready(room.unshare_screen(cx))
} else { } else {
@ -67,7 +66,6 @@ pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut AppContext) {
room.id(), room.id(),
room.channel_id(), room.channel_id(),
&client, &client,
cx,
); );
room.share_screen(cx) room.share_screen(cx)
} }
@ -86,7 +84,7 @@ pub fn toggle_mute(_: &ToggleMute, cx: &mut AppContext) {
} else { } else {
"disable microphone" "disable microphone"
}; };
report_call_event_for_room(operation, room.id(), room.channel_id(), &client, cx); report_call_event_for_room(operation, room.id(), room.channel_id(), &client);
room.toggle_mute(cx) room.toggle_mute(cx)
}) })

3
crates/editor/src/editor.rs
View file

@ -8874,7 +8874,7 @@ impl Editor {
let telemetry = project.read(cx).client().telemetry().clone(); let telemetry = project.read(cx).client().telemetry().clone();
telemetry.report_copilot_event(suggestion_id, suggestion_accepted, file_extension, cx) telemetry.report_copilot_event(suggestion_id, suggestion_accepted, file_extension)
} }
#[cfg(any(test, feature = "test-support"))] #[cfg(any(test, feature = "test-support"))]
@ -8926,7 +8926,6 @@ impl Editor {
operation, operation,
copilot_enabled, copilot_enabled,
copilot_enabled_for_language, copilot_enabled_for_language,
cx,
) )
} }

1
crates/editor/src/items.rs
View file

@ -866,6 +866,7 @@ impl Item for Editor {
} }
fn to_item_events(event: &EditorEvent, mut f: impl FnMut(ItemEvent)) { fn to_item_events(event: &EditorEvent, mut f: impl FnMut(ItemEvent)) {
dbg!(event);
match event { match event {
EditorEvent::Closed => f(ItemEvent::CloseItem), EditorEvent::Closed => f(ItemEvent::CloseItem),

2
crates/theme_selector/src/theme_selector.rs
View file

@ -182,7 +182,7 @@ impl PickerDelegate for ThemeSelectorDelegate {
let theme_name = cx.theme().name.clone(); let theme_name = cx.theme().name.clone();
self.telemetry self.telemetry
.report_setting_event("theme", theme_name.to_string(), cx); .report_setting_event("theme", theme_name.to_string());
update_settings_file::<ThemeSettings>(self.fs.clone(), cx, move |settings| { update_settings_file::<ThemeSettings>(self.fs.clone(), cx, move |settings| {
settings.theme = Some(theme_name.to_string()); settings.theme = Some(theme_name.to_string());

11
crates/welcome/src/base_keymap_picker.rs
View file

@ -1,4 +1,5 @@
use super::base_keymap_setting::BaseKeymap; use super::base_keymap_setting::BaseKeymap;
use client::telemetry::Telemetry;
use fuzzy::{match_strings, StringMatch, StringMatchCandidate}; use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
use gpui::{ use gpui::{
actions, AppContext, DismissEvent, EventEmitter, FocusableView, Render, Task, View, actions, AppContext, DismissEvent, EventEmitter, FocusableView, Render, Task, View,
@ -27,9 +28,10 @@ pub fn toggle(
cx: &mut ViewContext<Workspace>, cx: &mut ViewContext<Workspace>,
) { ) {
let fs = workspace.app_state().fs.clone(); let fs = workspace.app_state().fs.clone();
let telemetry = workspace.client().telemetry().clone();
workspace.toggle_modal(cx, |cx| { workspace.toggle_modal(cx, |cx| {
BaseKeymapSelector::new( BaseKeymapSelector::new(
BaseKeymapSelectorDelegate::new(cx.view().downgrade(), fs, cx), BaseKeymapSelectorDelegate::new(cx.view().downgrade(), fs, telemetry, cx),
cx, cx,
) )
}); });
@ -73,6 +75,7 @@ pub struct BaseKeymapSelectorDelegate {
view: WeakView<BaseKeymapSelector>, view: WeakView<BaseKeymapSelector>,
matches: Vec<StringMatch>, matches: Vec<StringMatch>,
selected_index: usize, selected_index: usize,
telemetry: Arc<Telemetry>,
fs: Arc<dyn Fs>, fs: Arc<dyn Fs>,
} }
@ -80,6 +83,7 @@ impl BaseKeymapSelectorDelegate {
fn new( fn new(
weak_view: WeakView<BaseKeymapSelector>, weak_view: WeakView<BaseKeymapSelector>,
fs: Arc<dyn Fs>, fs: Arc<dyn Fs>,
telemetry: Arc<Telemetry>,
cx: &mut ViewContext<BaseKeymapSelector>, cx: &mut ViewContext<BaseKeymapSelector>,
) -> Self { ) -> Self {
let base = BaseKeymap::get(None, cx); let base = BaseKeymap::get(None, cx);
@ -91,6 +95,7 @@ impl BaseKeymapSelectorDelegate {
view: weak_view, view: weak_view,
matches: Vec::new(), matches: Vec::new(),
selected_index, selected_index,
telemetry,
fs, fs,
} }
} }
@ -172,6 +177,10 @@ impl PickerDelegate for BaseKeymapSelectorDelegate {
fn confirm(&mut self, _: bool, cx: &mut ViewContext<Picker<BaseKeymapSelectorDelegate>>) { fn confirm(&mut self, _: bool, cx: &mut ViewContext<Picker<BaseKeymapSelectorDelegate>>) {
if let Some(selection) = self.matches.get(self.selected_index) { if let Some(selection) = self.matches.get(self.selected_index) {
let base_keymap = BaseKeymap::from_names(&selection.string); let base_keymap = BaseKeymap::from_names(&selection.string);
self.telemetry
.report_setting_event("keymap", base_keymap.to_string());
update_settings_file::<BaseKeymap>(self.fs.clone(), cx, move |setting| { update_settings_file::<BaseKeymap>(self.fs.clone(), cx, move |setting| {
*setting = Some(base_keymap) *setting = Some(base_keymap)
}); });

14
crates/welcome/src/base_keymap_setting.rs
View file

@ -1,3 +1,5 @@
use std::fmt::{Display, Formatter};
use schemars::JsonSchema; use schemars::JsonSchema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use settings::Settings; use settings::Settings;
@ -12,6 +14,18 @@ pub enum BaseKeymap {
TextMate, TextMate,
} }
impl Display for BaseKeymap {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
match self {
BaseKeymap::VSCode => write!(f, "VSCode"),
BaseKeymap::JetBrains => write!(f, "JetBrains"),
BaseKeymap::SublimeText => write!(f, "Sublime Text"),
BaseKeymap::Atom => write!(f, "Atom"),
BaseKeymap::TextMate => write!(f, "TextMate"),
}
}
}
impl BaseKeymap { impl BaseKeymap {
pub const OPTIONS: [(&'static str, Self); 5] = [ pub const OPTIONS: [(&'static str, Self); 5] = [
("VSCode (Default)", Self::VSCode), ("VSCode (Default)", Self::VSCode),

400
crates/welcome/src/welcome.rs
View file

@ -1,7 +1,7 @@
mod base_keymap_picker; mod base_keymap_picker;
mod base_keymap_setting; mod base_keymap_setting;
use client::TelemetrySettings; use client::{telemetry::Telemetry, TelemetrySettings};
use db::kvp::KEY_VALUE_STORE; use db::kvp::KEY_VALUE_STORE;
use gpui::{ use gpui::{
svg, AnyElement, AppContext, EventEmitter, FocusHandle, FocusableView, InteractiveElement, svg, AnyElement, AppContext, EventEmitter, FocusHandle, FocusableView, InteractiveElement,
@ -14,7 +14,7 @@ use ui::{prelude::*, Checkbox};
use vim::VimModeSetting; use vim::VimModeSetting;
use workspace::{ use workspace::{
dock::DockPosition, dock::DockPosition,
item::{Item, ItemEvent}, item::{Item, ItemEvent, ItemHandle},
open_new, AppState, Welcome, Workspace, WorkspaceId, open_new, AppState, Welcome, Workspace, WorkspaceId,
}; };
@ -27,7 +27,7 @@ pub fn init(cx: &mut AppContext) {
cx.observe_new_views(|workspace: &mut Workspace, _cx| { cx.observe_new_views(|workspace: &mut Workspace, _cx| {
workspace.register_action(|workspace, _: &Welcome, cx| { workspace.register_action(|workspace, _: &Welcome, cx| {
let welcome_page = cx.new_view(|cx| WelcomePage::new(workspace, cx)); let welcome_page = WelcomePage::new(workspace, cx);
workspace.add_item(Box::new(welcome_page), cx) workspace.add_item(Box::new(welcome_page), cx)
}); });
}) })
@ -39,7 +39,7 @@ pub fn init(cx: &mut AppContext) {
pub fn show_welcome_view(app_state: &Arc<AppState>, cx: &mut AppContext) { pub fn show_welcome_view(app_state: &Arc<AppState>, cx: &mut AppContext) {
open_new(&app_state, cx, |workspace, cx| { open_new(&app_state, cx, |workspace, cx| {
workspace.toggle_dock(DockPosition::Left, cx); workspace.toggle_dock(DockPosition::Left, cx);
let welcome_page = cx.new_view(|cx| WelcomePage::new(workspace, cx)); let welcome_page = WelcomePage::new(workspace, cx);
workspace.add_item_to_center(Box::new(welcome_page.clone()), cx); workspace.add_item_to_center(Box::new(welcome_page.clone()), cx);
cx.focus_view(&welcome_page); cx.focus_view(&welcome_page);
cx.notify(); cx.notify();
@ -54,174 +54,248 @@ pub fn show_welcome_view(app_state: &Arc<AppState>, cx: &mut AppContext) {
pub struct WelcomePage { pub struct WelcomePage {
workspace: WeakView<Workspace>, workspace: WeakView<Workspace>,
focus_handle: FocusHandle, focus_handle: FocusHandle,
telemetry: Arc<Telemetry>,
_settings_subscription: Subscription, _settings_subscription: Subscription,
} }
impl Render for WelcomePage { impl Render for WelcomePage {
fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> impl IntoElement { fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> impl IntoElement {
h_stack() h_stack().full().track_focus(&self.focus_handle).child(
.full() v_stack()
.bg(cx.theme().colors().editor_background) .w_96()
.track_focus(&self.focus_handle) .gap_4()
.child( .mx_auto()
v_stack() .child(
.w_96() svg()
.gap_4() .path("icons/logo_96.svg")
.mx_auto() .text_color(gpui::white())
.child( .w(px(96.))
svg() .h(px(96.))
.path("icons/logo_96.svg") .mx_auto(),
.text_color(gpui::white()) )
.w(px(96.)) .child(
.h(px(96.)) h_stack()
.mx_auto(), .justify_center()
) .child(Label::new("Code at the speed of thought")),
.child( )
h_stack() .child(
.justify_center() v_stack()
.child(Label::new("Code at the speed of thought")), .gap_2()
) .child(
.child( Button::new("choose-theme", "Choose a theme")
v_stack() .full_width()
.gap_2() .on_click(cx.listener(|this, _, cx| {
.child( this.telemetry
Button::new("choose-theme", "Choose a theme") .report_app_event("welcome page button: theme", false);
.full_width() this.workspace
.on_click(cx.listener(|this, _, cx| { .update(cx, |workspace, cx| {
this.workspace theme_selector::toggle(
.update(cx, |workspace, cx| { workspace,
theme_selector::toggle( &Default::default(),
workspace, cx,
&Default::default(), )
cx, })
) .ok();
}) })),
.ok(); )
})), .child(
) Button::new("choose-keymap", "Choose a keymap")
.child( .full_width()
Button::new("choose-keymap", "Choose a keymap") .on_click(cx.listener(|this, _, cx| {
.full_width() this.telemetry
.on_click(cx.listener(|this, _, cx| { .report_app_event("welcome page button: keymap", false);
this.workspace this.workspace
.update(cx, |workspace, cx| { .update(cx, |workspace, cx| {
base_keymap_picker::toggle( base_keymap_picker::toggle(
workspace, workspace,
&Default::default(), &Default::default(),
cx, cx,
) )
}) })
.ok(); .ok();
})), })),
) )
.child( .child(
Button::new("install-cli", "Install the CLI") Button::new("install-cli", "Install the CLI")
.full_width() .full_width()
.on_click(cx.listener(|_, _, cx| { .on_click(cx.listener(|this, _, cx| {
cx.app_mut() this.telemetry.report_app_event(
.spawn(|cx| async move { "welcome page button: install cli",
install_cli::install_cli(&cx).await false,
}) );
.detach_and_log_err(cx); cx.app_mut()
})), .spawn(
), |cx| async move { install_cli::install_cli(&cx).await },
)
.child(
v_stack()
.p_3()
.gap_2()
.bg(cx.theme().colors().elevated_surface_background)
.border_1()
.border_color(cx.theme().colors().border)
.rounded_md()
.child(
h_stack()
.gap_2()
.child(
Checkbox::new(
"enable-vim",
if VimModeSetting::get_global(cx).0 {
ui::Selection::Selected
} else {
ui::Selection::Unselected
},
) )
.on_click( .detach_and_log_err(cx);
cx.listener(move |this, selection, cx| { })),
this.update_settings::<VimModeSetting>( ),
selection, )
cx, .child(
|setting, value| *setting = Some(value), v_stack()
); .p_3()
}), .gap_2()
), .bg(cx.theme().colors().elevated_surface_background)
.border_1()
.border_color(cx.theme().colors().border)
.rounded_md()
.child(
h_stack()
.gap_2()
.child(
Checkbox::new(
"enable-vim",
if VimModeSetting::get_global(cx).0 {
ui::Selection::Selected
} else {
ui::Selection::Unselected
},
) )
.child(Label::new("Enable vim mode")), .on_click(cx.listener(
) move |this, selection, cx| {
.child( this.telemetry.report_app_event(
h_stack() "welcome page button: vim",
.gap_2() false,
.child( );
Checkbox::new( this.update_settings::<VimModeSetting>(
"enable-telemetry", selection,
if TelemetrySettings::get_global(cx).metrics { cx,
ui::Selection::Selected |setting, value| *setting = Some(value),
} else { );
ui::Selection::Unselected },
}, )),
) )
.on_click( .child(Label::new("Enable vim mode")),
cx.listener(move |this, selection, cx| { )
this.update_settings::<TelemetrySettings>( .child(
selection, h_stack()
cx, .gap_2()
|settings, value| { .child(
settings.metrics = Some(value) Checkbox::new(
}, "enable-telemetry",
); if TelemetrySettings::get_global(cx).metrics {
}), ui::Selection::Selected
), } else {
ui::Selection::Unselected
},
) )
.child(Label::new("Send anonymous usage data")), .on_click(cx.listener(
) move |this, selection, cx| {
.child( this.telemetry.report_app_event(
h_stack() "welcome page button: user telemetry",
.gap_2() false,
.child( );
Checkbox::new( this.update_settings::<TelemetrySettings>(
"enable-crash", selection,
if TelemetrySettings::get_global(cx).diagnostics { cx,
ui::Selection::Selected {
} else { let telemetry = this.telemetry.clone();
ui::Selection::Unselected
}, move |settings, value| {
) settings.metrics = Some(value);
.on_click(
cx.listener(move |this, selection, cx| { telemetry.report_setting_event(
this.update_settings::<TelemetrySettings>( "user telemetry",
selection, value.to_string(),
cx, );
|settings, value| { }
settings.diagnostics = Some(value) },
}, );
); },
}), )),
), )
.child(Label::new("Send anonymous usage data")),
)
.child(
h_stack()
.gap_2()
.child(
Checkbox::new(
"enable-crash",
if TelemetrySettings::get_global(cx).diagnostics {
ui::Selection::Selected
} else {
ui::Selection::Unselected
},
) )
.child(Label::new("Send crash reports")), .on_click(cx.listener(
), move |this, selection, cx| {
), this.telemetry.report_app_event(
) "welcome page button: crash diagnostics",
false,
);
this.update_settings::<TelemetrySettings>(
selection,
cx,
{
let telemetry = this.telemetry.clone();
move |settings, value| {
settings.diagnostics = Some(value);
telemetry.report_setting_event(
"crash diagnostics",
value.to_string(),
);
}
},
);
},
)),
)
.child(Label::new("Send crash reports")),
),
),
)
} }
} }
impl WelcomePage { impl WelcomePage {
pub fn new(workspace: &Workspace, cx: &mut ViewContext<Self>) -> Self { pub fn new(workspace: &Workspace, cx: &mut ViewContext<Workspace>) -> View<Self> {
WelcomePage { let this = cx.new_view(|cx| WelcomePage {
focus_handle: cx.focus_handle(), focus_handle: cx.focus_handle(),
workspace: workspace.weak_handle(), workspace: workspace.weak_handle(),
telemetry: workspace.client().telemetry().clone(),
_settings_subscription: cx.observe_global::<SettingsStore>(move |_, cx| cx.notify()), _settings_subscription: cx.observe_global::<SettingsStore>(move |_, cx| cx.notify()),
} });
this.on_release(
cx,
Box::new(|cx| {
this.update(cx, |this, _| {
this.telemetry.report_app_event("close welcome page", false);
})
}),
)
.detach();
// this.subscribe_to_item_events(
// cx,
// Box::new(|event: ItemEvent, cx| {
// // if event == ItemEvent::CloseItem {
// dbg!(event);
// // welcome.update(cx, |welcome, _| {
// // welcome
// // .telemetry
// // .report_app_event("close welcome page", false);
// // })
// // }
// }),
// )
// .detach();
cx.subscribe(&this, |_, welcome, event, cx| {
if *event == ItemEvent::CloseItem {
welcome.update(cx, |welcome, _| {
welcome
.telemetry
.report_app_event("close welcome page", false);
})
}
})
.detach();
this
} }
fn update_settings<T: Settings>( fn update_settings<T: Settings>(
@ -279,6 +353,7 @@ impl Item for WelcomePage {
Some(cx.new_view(|cx| WelcomePage { Some(cx.new_view(|cx| WelcomePage {
focus_handle: cx.focus_handle(), focus_handle: cx.focus_handle(),
workspace: self.workspace.clone(), workspace: self.workspace.clone(),
telemetry: self.telemetry.clone(),
_settings_subscription: cx.observe_global::<SettingsStore>(move |_, cx| cx.notify()), _settings_subscription: cx.observe_global::<SettingsStore>(move |_, cx| cx.notify()),
})) }))
} }
@ -287,3 +362,16 @@ impl Item for WelcomePage {
f(*event) f(*event)
} }
} }
// TODO
// - [X] get theme value
// - [X] In selector
// - [X] In main
// - [ ] get value of keymap selector
// - [X] In selector
// - [X] In main
// - [ ] get all button clicks
// - [ ] get value of usage data enabled
// - [ ] get value of crash reports enabled
// - [ ] get welcome screen close
// - [ ] test all events

2
crates/workspace/src/workspace.rs
View file

@ -1260,7 +1260,7 @@ impl Workspace {
pub fn open(&mut self, _: &Open, cx: &mut ViewContext<Self>) { pub fn open(&mut self, _: &Open, cx: &mut ViewContext<Self>) {
self.client() self.client()
.telemetry() .telemetry()
.report_app_event("open project", false, cx); .report_app_event("open project", false);
let paths = cx.prompt_for_paths(PathPromptOptions { let paths = cx.prompt_for_paths(PathPromptOptions {
files: true, files: true,
directories: true, directories: true,

24
crates/zed/src/main.rs
View file

@ -45,7 +45,7 @@ use util::{
paths, ResultExt, paths, ResultExt,
}; };
use uuid::Uuid; use uuid::Uuid;
use welcome::{show_welcome_view, FIRST_OPEN}; use welcome::{show_welcome_view, BaseKeymap, FIRST_OPEN};
use workspace::{AppState, WorkspaceStore}; use workspace::{AppState, WorkspaceStore};
use zed::{ use zed::{
app_menus, build_window_options, ensure_only_instance, handle_cli_connection, app_menus, build_window_options, ensure_only_instance, handle_cli_connection,
@ -171,17 +171,17 @@ fn main() {
}) })
.detach(); .detach();
client.telemetry().start(installation_id, session_id, cx); let telemetry = client.telemetry();
client telemetry.start(installation_id, session_id, cx);
.telemetry() telemetry.report_setting_event("theme", cx.theme().name.to_string());
.report_setting_event("theme", cx.theme().name.to_string(), cx); telemetry.report_setting_event("keymap", BaseKeymap::get_global(cx).to_string());
let event_operation = match existing_installation_id_found { telemetry.report_app_event(
Some(false) => "first open", match existing_installation_id_found {
_ => "open", Some(false) => "first open",
}; _ => "open",
client },
.telemetry() true,
.report_app_event(event_operation, true, cx); );
let app_state = Arc::new(AppState { let app_state = Arc::new(AppState {
languages: languages.clone(), languages: languages.clone(),