From 5b7e31c0753ff06a4f49a010fd84716f4aff0f08 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Tue, 25 Jun 2024 16:47:55 -0400
Subject: [PATCH] Add metrics_id to editor_events (#13525)

Release Notes:

- N/A
---
 crates/client/src/telemetry.rs                  | 1 +
 crates/collab/src/api/events.rs                 | 2 ++
 crates/telemetry_events/src/telemetry_events.rs | 1 +
 3 files changed, 4 insertions(+)

diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index 1efa4ccd78..75b1c81253 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -611,6 +611,7 @@ impl Telemetry {
 
                         let request_body = EventRequestBody {
                             installation_id: state.installation_id.as_deref().map(Into::into),
+                            metrics_id: state.metrics_id.as_deref().map(Into::into),
                             session_id: state.session_id.clone(),
                             is_staff: state.is_staff,
                             app_version: state.app_version.clone(),
diff --git a/crates/collab/src/api/events.rs b/crates/collab/src/api/events.rs
index c3b7a21a92..55d743ba9b 100644
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -664,6 +664,7 @@ where
 #[derive(Serialize, Debug, clickhouse::Row)]
 pub struct EditorEventRow {
     installation_id: String,
+    metrics_id: String,
     operation: String,
     app_version: String,
     file_extension: String,
@@ -713,6 +714,7 @@ impl EditorEventRow {
             os_version: body.os_version.clone().unwrap_or_default(),
             architecture: body.architecture.clone(),
             installation_id: body.installation_id.clone().unwrap_or_default(),
+            metrics_id: body.metrics_id.clone().unwrap_or_default(),
             session_id: body.session_id.clone(),
             is_staff: body.is_staff,
             time: time.timestamp_millis(),
diff --git a/crates/telemetry_events/src/telemetry_events.rs b/crates/telemetry_events/src/telemetry_events.rs
index ff9baab486..d1fb0f5fdb 100644
--- a/crates/telemetry_events/src/telemetry_events.rs
+++ b/crates/telemetry_events/src/telemetry_events.rs
@@ -5,6 +5,7 @@ use std::{fmt::Display, sync::Arc, time::Duration};
 #[derive(Serialize, Deserialize, Debug)]
 pub struct EventRequestBody {
     pub installation_id: Option<String>,
+    pub metrics_id: Option<String>,
     pub session_id: Option<String>,
     pub is_staff: Option<bool>,
     pub app_version: String,