Merge pull request #1668 from zed-industries/telemetry-fixes

Max Brunsfeld created 3 years ago

Telemetry fixes

Change summary

crates/client/src/client.rs    | 21 ++++-----------------
crates/client/src/telemetry.rs | 12 +++++++++++-
2 files changed, 15 insertions(+), 18 deletions(-)

Detailed changes

crates/client/src/client.rs

@@ -15,11 +15,9 @@ use async_tungstenite::tungstenite::{
 use db::Db;
 use futures::{future::LocalBoxFuture, FutureExt, SinkExt, StreamExt, TryStreamExt};
 use gpui::{
-    actions,
-    serde_json::{json, Value},
-    AnyModelHandle, AnyViewHandle, AnyWeakModelHandle, AnyWeakViewHandle, AppContext,
-    AsyncAppContext, Entity, ModelContext, ModelHandle, MutableAppContext, Task, View, ViewContext,
-    ViewHandle,
+    actions, serde_json::Value, AnyModelHandle, AnyViewHandle, AnyWeakModelHandle,
+    AnyWeakViewHandle, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle,
+    MutableAppContext, Task, View, ViewContext, ViewHandle,
 };
 use http::HttpClient;
 use lazy_static::lazy_static;
@@ -56,7 +54,7 @@ lazy_static! {
 
 pub const ZED_SECRET_CLIENT_TOKEN: &str = "618033988749894";
 
-actions!(client, [Authenticate, TestTelemetry]);
+actions!(client, [Authenticate]);
 
 pub fn init(client: Arc<Client>, cx: &mut MutableAppContext) {
     cx.add_global_action({
@@ -69,17 +67,6 @@ pub fn init(client: Arc<Client>, cx: &mut MutableAppContext) {
             .detach();
         }
     });
-    cx.add_global_action({
-        let client = client.clone();
-        move |_: &TestTelemetry, _| {
-            client.report_event(
-                "test_telemetry",
-                json!({
-                    "test_property": "test_value"
-                }),
-            )
-        }
-    });
 }
 
 pub struct Client {

crates/client/src/telemetry.rs

@@ -52,6 +52,12 @@ lazy_static! {
 struct AmplitudeEventBatch {
     api_key: &'static str,
     events: Vec<AmplitudeEvent>,
+    options: AmplitudeEventBatchOptions,
+}
+
+#[derive(Serialize)]
+struct AmplitudeEventBatchOptions {
+    min_id_length: usize,
 }
 
 #[derive(Serialize)]
@@ -239,7 +245,11 @@ impl Telemetry {
                             }
                         }
 
-                        let batch = AmplitudeEventBatch { api_key, events };
+                        let batch = AmplitudeEventBatch {
+                            api_key,
+                            events,
+                            options: AmplitudeEventBatchOptions { min_id_length: 1 },
+                        };
                         json_bytes.clear();
                         serde_json::to_writer(&mut json_bytes, &batch)?;
                         let request =