Add release channel information to telemetry events

Joseph T Lyons created 3 years ago

Change summary

crates/auto_update/src/update_notification.rs |  6 +-----
crates/client/src/amplitude_telemetry.rs      |  6 ++++++
crates/client/src/telemetry.rs                |  6 ++++++
crates/settings/src/settings.rs               | 10 ++++++++++
crates/zed/src/main.rs                        |  6 +++---
crates/zed/src/zed.rs                         |  6 +-----
6 files changed, 27 insertions(+), 13 deletions(-)

Detailed changes

crates/auto_update/src/update_notification.rs

@@ -29,11 +29,7 @@ impl View for UpdateNotification {
         let theme = cx.global::<Settings>().theme.clone();
         let theme = &theme.update_notification;
 
-        let app_name = match *cx.global::<ReleaseChannel>() {
-            ReleaseChannel::Dev => "Zed Dev",
-            ReleaseChannel::Preview => "Zed Preview",
-            ReleaseChannel::Stable => "Zed",
-        };
+        let app_name = cx.global::<ReleaseChannel>().name();
 
         MouseEventHandler::<ViewReleaseNotes>::new(0, cx, |state, cx| {
             Flex::column()

crates/client/src/amplitude_telemetry.rs

@@ -10,6 +10,7 @@ use lazy_static::lazy_static;
 use parking_lot::Mutex;
 use serde::Serialize;
 use serde_json::json;
+use settings::ReleaseChannel;
 use std::{
     io::Write,
     mem,
@@ -33,6 +34,7 @@ struct AmplitudeTelemetryState {
     metrics_id: Option<Arc<str>>,
     device_id: Option<Arc<str>>,
     app_version: Option<Arc<str>>,
+    release_channel: &'static str,
     os_version: Option<Arc<str>>,
     os_name: &'static str,
     queue: Vec<AmplitudeEvent>,
@@ -70,6 +72,7 @@ struct AmplitudeEvent {
     app_version: Option<Arc<str>>,
     #[serde(rename = "App")]
     app: &'static str,
+    release_channel: &'static str,
     event_id: usize,
     session_id: u128,
     time: u128,
@@ -90,6 +93,7 @@ const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(30);
 impl AmplitudeTelemetry {
     pub fn new(client: Arc<dyn HttpClient>, cx: &AppContext) -> Arc<Self> {
         let platform = cx.platform();
+        let release_channel = cx.global::<ReleaseChannel>().name();
         let this = Arc::new(Self {
             http_client: client,
             executor: cx.background().clone(),
@@ -107,6 +111,7 @@ impl AmplitudeTelemetry {
                     .app_version()
                     .log_err()
                     .map(|v| v.to_string().into()),
+                release_channel,
                 device_id: None,
                 queue: Default::default(),
                 flush_task: Default::default(),
@@ -221,6 +226,7 @@ impl AmplitudeTelemetry {
             app: "Zed",
             os_version: state.os_version.clone(),
             app_version: state.app_version.clone(),
+            release_channel: state.release_channel,
             event_id: post_inc(&mut state.next_event_id),
         };
         state.queue.push(event);

crates/client/src/telemetry.rs

@@ -10,6 +10,7 @@ use lazy_static::lazy_static;
 use parking_lot::Mutex;
 use serde::Serialize;
 use serde_json::json;
+use settings::ReleaseChannel;
 use std::{
     io::Write,
     mem,
@@ -32,6 +33,7 @@ struct TelemetryState {
     metrics_id: Option<Arc<str>>,
     device_id: Option<Arc<str>>,
     app_version: Option<Arc<str>>,
+    release_channel: &'static str,
     os_version: Option<Arc<str>>,
     os_name: &'static str,
     queue: Vec<MixpanelEvent>,
@@ -69,6 +71,7 @@ struct MixpanelEventProperties {
     event_properties: Option<Map<String, Value>>,
     os_name: &'static str,
     os_version: Option<Arc<str>>,
+    release_channel: &'static str,
     app_version: Option<Arc<str>>,
     signed_in: bool,
     #[serde(rename = "App")]
@@ -100,6 +103,7 @@ const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(30);
 impl Telemetry {
     pub fn new(client: Arc<dyn HttpClient>, cx: &AppContext) -> Arc<Self> {
         let platform = cx.platform();
+        let release_channel = cx.global::<ReleaseChannel>().name();
         let this = Arc::new(Self {
             http_client: client,
             executor: cx.background().clone(),
@@ -113,6 +117,7 @@ impl Telemetry {
                     .app_version()
                     .log_err()
                     .map(|v| v.to_string().into()),
+                release_channel,
                 device_id: None,
                 metrics_id: None,
                 queue: Default::default(),
@@ -228,6 +233,7 @@ impl Telemetry {
                 },
                 os_name: state.os_name,
                 os_version: state.os_version.clone(),
+                release_channel: state.release_channel,
                 app_version: state.app_version.clone(),
                 signed_in: state.metrics_id.is_some(),
                 app: "Zed",

crates/settings/src/settings.rs

@@ -62,6 +62,16 @@ pub enum ReleaseChannel {
     Stable,
 }
 
+impl ReleaseChannel {
+    pub fn name(&self) -> &'static str {
+        match self {
+            ReleaseChannel::Dev => "Zed Dev",
+            ReleaseChannel::Preview => "Zed Preview",
+            ReleaseChannel::Stable => "Zed",
+        }
+    }
+}
+
 impl FeatureFlags {
     pub fn keymap_files(&self) -> Vec<&'static str> {
         vec![]

crates/zed/src/main.rs

@@ -86,6 +86,9 @@ fn main() {
     });
 
     app.run(move |cx| {
+        cx.set_global(*RELEASE_CHANNEL);
+        cx.set_global(HomeDir(zed::paths::HOME.to_path_buf()));
+
         let client = client::Client::new(http.clone(), cx);
         let mut languages = LanguageRegistry::new(login_shell_env_loaded);
         languages.set_language_server_download_dir(zed::paths::LANGUAGES_DIR.clone());
@@ -97,9 +100,6 @@ fn main() {
 
         let (settings_file_content, keymap_file) = cx.background().block(config_files).unwrap();
 
-        cx.set_global(*RELEASE_CHANNEL);
-        cx.set_global(HomeDir(zed::paths::HOME.to_path_buf()));
-
         //Setup settings global before binding actions
         cx.set_global(SettingsFile::new(
             &*zed::paths::SETTINGS,

crates/zed/src/zed.rs

@@ -389,11 +389,7 @@ fn quit(_: &Quit, cx: &mut gpui::MutableAppContext) {
 }
 
 fn about(_: &mut Workspace, _: &About, cx: &mut gpui::ViewContext<Workspace>) {
-    let app_name = match *cx.global::<ReleaseChannel>() {
-        ReleaseChannel::Dev => "Zed Dev",
-        ReleaseChannel::Preview => "Zed Preview",
-        ReleaseChannel::Stable => "Zed",
-    };
+    let app_name = cx.global::<ReleaseChannel>().name();
     let version = env!("CARGO_PKG_VERSION");
     cx.prompt(
         gpui::PromptLevel::Info,