fix: publishing missing datapoints in UserTriggerDecisionEvent telemetry events (#217)

* Fix publishing missing datapoints in UserTriggerDecisionEvent telemetry events

* Fix publishing missing datapoints in UserTriggerDecisionEvent telemetry events

Author: brandonskiser

crates/fig_telemetry/src/event.rs

@@ -101,7 +101,8 @@ pub(crate) mod tests {
             request_id: "XXX".into(),
             suggestion_state: SuggestionState::Accept,
             edit_buffer_len: Some(123),
-            suggested_chars_len: Some(42),
+            suggested_chars_len: 42,
+            number_of_recommendations: 3,
             latency: Duration::from_millis(500),
             terminal: Some("vscode".into()),
             terminal_version: Some("1.0".into()),

crates/fig_telemetry/src/lib.rs

@@ -345,13 +345,17 @@ impl Client {
                 request_id,
                 latency,
                 suggestion_state,
+                suggested_chars_len,
+                number_of_recommendations,
                 ..
             } => {
                 self.send_cw_telemetry_user_trigger_decision_event(
                     session_id.clone(),
                     request_id.clone(),
                     *latency,
                     suggestion_state.is_accepted(),
+                    *suggested_chars_len,
+                    *number_of_recommendations,
                 )
                 .await;
             },
@@ -527,6 +531,8 @@ impl Client {
         request_id: String,
         latency: Duration,
         accepted: bool,
+        suggested_chars_len: i32,
+        number_of_recommendations: i32,
     ) {
         let Some(codewhisperer_client) = self.codewhisperer_client.clone() else {
             return;
@@ -554,6 +560,9 @@ impl Client {
             .programming_language(programming_language)
             .completion_type(CompletionType::Line)
             .suggestion_state(suggestion_state.into())
+            .accepted_character_count(if accepted { suggested_chars_len } else { 0 })
+            .number_of_recommendations(number_of_recommendations)
+            .generated_line(1)
             .recommendation_latency_milliseconds(latency.as_secs_f64() * 1000.0)
             .timestamp(DateTime::from(SystemTime::now()))
             .build()

crates/fig_telemetry_core/src/lib.rs

@@ -156,7 +156,7 @@ impl Event {
                     codewhispererterminal_duration: None,
                     codewhispererterminal_accepted: Some(suggestion_state.is_accepted().into()),
                     codewhispererterminal_typed_count: edit_buffer_len.map(Into::into),
-                    codewhispererterminal_suggested_count: suggested_chars_len.map(Into::into),
+                    codewhispererterminal_suggested_count: Some(Into::into(suggested_chars_len as i64)),
                     codewhispererterminal_terminal: terminal.map(Into::into),
                     codewhispererterminal_terminal_version: terminal_version.map(Into::into),
                     codewhispererterminal_shell: shell.map(Into::into),
@@ -319,7 +319,8 @@ pub enum EventType {
         request_id: String,
         suggestion_state: SuggestionState,
         edit_buffer_len: Option<i64>,
-        suggested_chars_len: Option<i64>,
+        suggested_chars_len: i32,
+        number_of_recommendations: i32,
         latency: Duration,
         terminal: Option<String>,
         terminal_version: Option<String>,

crates/figterm/src/inline/mod.rs

@@ -87,6 +87,7 @@ impl TelemetryQueue {
                 suggestion_state,
                 edit_buffer_len,
                 suggested_chars_len,
+                number_of_recommendations,
                 latency,
                 ..
             } = item;
@@ -101,6 +102,7 @@ impl TelemetryQueue {
                         suggestion_state,
                         edit_buffer_len,
                         suggested_chars_len,
+                        number_of_recommendations,
                         latency,
                         terminal: current_terminal().map(|s| s.internal_id().into_owned()),
                         terminal_version: current_terminal_version().map(Into::into),
@@ -126,7 +128,8 @@ struct TelemetryQueueItem {
     request_id: String,
     suggestion_state: SuggestionState,
     edit_buffer_len: Option<i64>,
-    suggested_chars_len: Option<i64>,
+    suggested_chars_len: i32,
+    number_of_recommendations: i32,
     latency: Duration,
 }
 
@@ -254,6 +257,7 @@ pub async fn handle_request(
                 let request_id = output.request_id.unwrap_or_default();
                 let session_id = output.session_id.unwrap_or_default();
                 let completions = output.recommendations;
+                let number_of_recommendations = completions.len();
                 let mut completion_cache = COMPLETION_CACHE.lock().await;
 
                 let mut completions = completions
@@ -290,7 +294,8 @@ pub async fn handle_request(
                         let buffer = buffer.to_owned();
                         async move {
                             TELEMETRY_QUEUE.lock().await.items.push(TelemetryQueueItem {
-                                suggested_chars_len: completion.chars().count().try_into().ok(),
+                                suggested_chars_len: completion.chars().count() as i32,
+                                number_of_recommendations: number_of_recommendations as i32,
                                 suggestion: completion,
                                 timestamp: SystemTime::now(),
                                 session_id,