fix: remove cw telemetry client for sigv4, revert skipping banner printing to stderr in noninteractive mode (#335)

Author: brandonskiser

crates/chat-cli/src/api_client/mod.rs

@@ -90,7 +90,7 @@ impl ApiClient {
             .region(endpoint.region.clone())
             .credentials_provider(credentials)
             .timeout_config(timeout_config(database))
-            .retry_config(RetryConfig::adaptive())
+            .retry_config(retry_config())
             .load()
             .await;
 
@@ -137,7 +137,7 @@ impl ApiClient {
                             .region(endpoint.region.clone())
                             .credentials_provider(credentials_chain)
                             .timeout_config(timeout_config(database))
-                            .retry_config(RetryConfig::adaptive())
+                            .retry_config(retry_config())
                             .load()
                             .await,
                     )
@@ -463,6 +463,10 @@ fn timeout_config(database: &Database) -> TimeoutConfig {
         .build()
 }
 
+fn retry_config() -> RetryConfig {
+    RetryConfig::standard().with_max_attempts(1)
+}
+
 pub fn stalled_stream_protection_config() -> StalledStreamProtectionConfig {
     StalledStreamProtectionConfig::enabled()
         .grace_period(Duration::from_secs(60 * 5))

crates/chat-cli/src/cli/chat/mod.rs

@@ -884,7 +884,6 @@ impl Default for ChatState {
 impl ChatSession {
     async fn spawn(&mut self, os: &mut Os) -> Result<()> {
         let is_small_screen = self.terminal_width() < GREETING_BREAK_POINT;
-        let mut interactive_text: Vec<u8> = Vec::new();
         if os
             .database
             .settings
@@ -899,20 +898,20 @@ impl ChatSession {
                 },
             };
 
-            execute!(interactive_text, style::Print(welcome_text), style::Print("\n\n"),)?;
+            execute!(self.stderr, style::Print(welcome_text), style::Print("\n\n"),)?;
 
             let tip = ROTATING_TIPS[usize::try_from(rand::random::<u32>()).unwrap_or(0) % ROTATING_TIPS.len()];
             if is_small_screen {
                 // If the screen is small, print the tip in a single line
                 execute!(
-                    interactive_text,
+                    self.stderr,
                     style::Print("💡 ".to_string()),
                     style::Print(tip),
                     style::Print("\n")
                 )?;
             } else {
                 draw_box(
-                    &mut interactive_text,
+                    &mut self.stderr,
                     "Did you know?",
                     tip,
                     GREETING_BREAK_POINT,
@@ -921,7 +920,7 @@ impl ChatSession {
             }
 
             execute!(
-                interactive_text,
+                self.stderr,
                 style::Print("\n"),
                 style::Print(match is_small_screen {
                     true => SMALL_SCREEN_POPULAR_SHORTCUTS,
@@ -934,27 +933,24 @@ impl ChatSession {
                         .dark_grey()
                 )
             )?;
-            execute!(
-                interactive_text,
-                style::Print("\n"),
-                style::SetForegroundColor(Color::Reset)
-            )?;
+            execute!(self.stderr, style::Print("\n"), style::SetForegroundColor(Color::Reset))?;
         }
 
         if self.all_tools_trusted() {
             queue!(
-                interactive_text,
+                self.stderr,
                 style::Print(format!(
                     "{}{TRUST_ALL_TEXT}\n\n",
                     if !is_small_screen { "\n" } else { "" }
                 ))
             )?;
         }
+        self.stderr.flush()?;
 
         if let Some(ref id) = self.conversation.model {
             if let Some(model_option) = MODEL_OPTIONS.iter().find(|option| option.model_id == *id) {
                 execute!(
-                    interactive_text,
+                    self.stderr,
                     style::SetForegroundColor(Color::Cyan),
                     style::Print(format!("🤖 You are chatting with {}\n", model_option.name)),
                     style::SetForegroundColor(Color::Reset),
@@ -963,11 +959,6 @@ impl ChatSession {
             }
         }
 
-        if self.interactive {
-            self.stderr.write_all(&interactive_text)?;
-            self.stderr.flush()?;
-        }
-
         if let Some(user_input) = self.initial_input.take() {
             self.inner = Some(ChatState::HandleInput { input: user_input });
         }

crates/chat-cli/src/telemetry/mod.rs

@@ -364,7 +364,7 @@ async fn set_start_url_and_region(database: &Database, event: &mut Event) {
 struct TelemetryClient {
     client_id: Uuid,
     telemetry_enabled: bool,
-    codewhisperer_client: ApiClient,
+    codewhisperer_client: Option<ApiClient>,
     toolkit_telemetry_client: Option<ToolkitTelemetryClient>,
 }
 
@@ -421,23 +421,36 @@ impl TelemetryClient {
             })
         }
 
+        // cw telemetry is only available with bearer token auth.
+        let codewhisperer_client = if env.get("AMAZON_Q_SIGV4").is_ok() {
+            None
+        } else {
+            Some(ApiClient::new(env, fs, database, None).await?)
+        };
+
         Ok(Self {
             client_id: client_id(env, database, telemetry_enabled)?,
             telemetry_enabled,
             toolkit_telemetry_client,
-            codewhisperer_client: ApiClient::new(env, fs, database, None).await?,
+            codewhisperer_client,
         })
     }
 
+    /// Sends a telemetry event to both the CW and toolkit API's. If the clients do not exist, then
+    /// telemetry is not sent.
+    ///
+    /// See [TelemetryClient::new] for which conditions the clients are created for.
     async fn send_event(&self, event: Event) {
-        // This client will exist when telemetry is disabled.
         self.send_cw_telemetry_event(&event).await;
-
-        // This client won't exist when telemetry is disabled.
         self.send_telemetry_toolkit_metric(event).await;
     }
 
     async fn send_cw_telemetry_event(&self, event: &Event) {
+        let Some(codewhisperer_client) = self.codewhisperer_client.clone() else {
+            trace!("not sending cw metric - client does not exist");
+            return;
+        };
+
         if let EventType::ChatAddedMessage {
             conversation_id,
             message_id,
@@ -466,8 +479,7 @@ impl TelemetryClient {
                 telemetry_enabled = self.telemetry_enabled,
                 "Sending cw telemetry event"
             );
-            if let Err(err) = self
-                .codewhisperer_client
+            if let Err(err) = codewhisperer_client
                 .send_telemetry_event(event, user_context, self.telemetry_enabled, model.to_owned())
                 .await
             {
@@ -651,6 +663,8 @@ mod test {
             .unwrap();
         client
             .codewhisperer_client
+            .as_ref()
+            .expect("cw telemetry client should exist")
             .send_telemetry_event(
                 TelemetryEvent::ChatAddMessageEvent(
                     ChatAddMessageEvent::builder()