Skip to content

fail to send logging #1255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ehayes2000 merged 3 commits into from
Jan 30, 2026
Merged

fail to send logging #1255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f914581
fail to send logging
ehayes2000 Jan 30, 2026
bc226bd
toast on ws fail
ehayes2000 Jan 30, 2026
21e34ce
refactor: use tracing::instrument on ws_send for auto error logging
ehayes2000 Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 35 additions & 15 deletions rust/cloud-storage/document_cognition_service/src/api/ws/chat_message/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@ pub async fn stream_chat_response(
message_id: message_id.to_string(),
content: message_part,
};
ws_send(sender, response);
ws_send(sender, response).map_err(|err| {
tracing::error!(error=?err, "failed to send chat message response");
ai::types::AiError::Generic(err)
})?;
}
StreamPart::ToolCall(call) => {
let message_part = AssistantMessagePart::ToolCall {
Expand All @@ -175,7 +178,10 @@ pub async fn stream_chat_response(
message_id: message_id.to_string(),
content: message_part,
};
ws_send(sender, response);
ws_send(sender, response).map_err(|err| {
tracing::error!(error=?err, "failed to send tool call response");
ai::types::AiError::Generic(err)
})?;
}
StreamPart::Usage(usage) => {
tracing::debug!(record=?usage, "usage");
Expand All @@ -192,6 +198,10 @@ pub async fn stream_chat_response(
content: message_part,
},
)
.map_err(|err| {
tracing::error!(error=?err, "failed to send tool response json");
ai::types::AiError::Generic(err)
})?;
}
StreamPart::ToolResponse(ai::tool::types::ToolResponse::Err {
id,
Expand All @@ -213,6 +223,10 @@ pub async fn stream_chat_response(
content: message_part,
},
)
.map_err(|err| {
tracing::error!(error=?err, "failed to send tool response err");
ai::types::AiError::Generic(err)
})?;
}
}
}
Expand Down Expand Up @@ -362,7 +376,13 @@ pub async fn handle_send_chat_message(
FromWebSocketMessage::StreamEnd {
stream_id: incoming_message.stream_id.clone(),
},
);
)
.map_err(|err| {
tracing::error!(error=?err, "failed to send stream end");
StreamError::InternalError {
stream_id: incoming_message.stream_id.clone(),
}
})?;

store_conversation_messages(
ctx.clone(),
Expand All @@ -380,20 +400,20 @@ pub async fn handle_send_chat_message(
})?;

// The chat is empty and we want to auto generate a name for the chat
if is_first_message {
let _ = maybe_rename_chat(&incoming_message.chat_id, &ctx, user_id.0.as_ref())
if is_first_message
&& let Ok(new_name) = maybe_rename_chat(&incoming_message.chat_id, &ctx, user_id.0.as_ref())
.await
.inspect_err(|err| tracing::error!(error=?err, "failed to rename chat"))
.map(|new_name| {
ws_send(
sender,
FromWebSocketMessage::ChatRenamed {
chat_id: incoming_message.chat_id.clone(),
stream_id: incoming_message.stream_id.clone(),
name: new_name,
},
)
});
&& let Err(err) = ws_send(
sender,
FromWebSocketMessage::ChatRenamed {
chat_id: incoming_message.chat_id.clone(),
stream_id: incoming_message.stream_id.clone(),
name: new_name,
},
)
{
tracing::error!(error=?err, "failed to send chat renamed");
}
Ok(())
}
4 changes: 2 additions & 2 deletions rust/cloud-storage/document_cognition_service/src/api/ws/completion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ async fn stream_completion(
done: false,
};

ws_send(sender, response);
ws_send(sender, response)?;
}
}

Expand All @@ -194,7 +194,7 @@ async fn stream_completion(
content: response_message,
done: true,
},
);
)?;

Ok(())
}
Expand Down
130 changes: 82 additions & 48 deletions rust/cloud-storage/document_cognition_service/src/api/ws/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ async fn process_incoming_message(
Message::Text(text) => {
// Handle heartbeat ping messages
if text == "ping" {
ws_send(message_sender, FromWebSocketMessage::Pong);
ws_send(message_sender, FromWebSocketMessage::Pong)?;
return Ok(None);
}

Expand Down Expand Up @@ -192,36 +192,39 @@ async fn handle_websocket_connection(
if let Err(err) =
ensure_user_attachment_access(&ctx, user_context.clone(), attachments).await
{
ws_send(&message_sender_clone, FromWebSocketMessage::Error(err));
if let Err(send_err) =
Copy link
Member

@whutchinson98 whutchinson98 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inspect err

ws_send(&message_sender_clone, FromWebSocketMessage::Error(err))
{
tracing::error!(error=?send_err, "failed to send attachment access error");
}
continue;
}

match incoming_message {
ToWebSocketMessage::SendChatMessage(payload) => {
if let Err(e) = check_user_quota(&ctx, &user_context).await {
match e {
let send_result = match e {
UserQuotaError::InvalidMacroUserId
| UserQuotaError::UnableToGetUserPermissions
| UserQuotaError::UnableToGetUserQuota => {
ws_send(
&message_sender_clone,
FromWebSocketMessage::Error(WebSocketError::StreamError(
StreamError::InternalError {
stream_id: payload.stream_id,
},
)),
);
}
UserQuotaError::ExceededMaxChatMessages => {
ws_send(
&message_sender_clone,
FromWebSocketMessage::Error(WebSocketError::StreamError(
StreamError::PaymentRequired {
stream_id: payload.stream_id,
},
)),
);
}
| UserQuotaError::UnableToGetUserQuota => ws_send(
&message_sender_clone,
FromWebSocketMessage::Error(WebSocketError::StreamError(
StreamError::InternalError {
stream_id: payload.stream_id,
},
)),
),
UserQuotaError::ExceededMaxChatMessages => ws_send(
&message_sender_clone,
FromWebSocketMessage::Error(WebSocketError::StreamError(
StreamError::PaymentRequired {
stream_id: payload.stream_id,
},
)),
),
};
if let Err(send_err) = send_result {
Copy link
Member

@whutchinson98 whutchinson98 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inspect err

tracing::error!(error=?send_err, "failed to send user quota error");
}
continue;
}
Expand All @@ -230,14 +233,16 @@ async fn handle_websocket_connection(
{
Ok(id) => Arc::new(id),
Err(_) => {
ws_send(
if let Err(send_err) = ws_send(
Copy link
Member

@whutchinson98 whutchinson98 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inspect err

&message_sender_clone,
FromWebSocketMessage::Error(WebSocketError::StreamError(
StreamError::InternalError {
stream_id: payload.stream_id.clone(),
},
)),
);
) {
tracing::error!(error=?send_err, "failed to send user id error");
}
continue;
}
};
Expand All @@ -254,19 +259,25 @@ async fn handle_websocket_connection(
.await
{
Err(e) => {
ws_send(&message_sender_clone, FromWebSocketMessage::Error(e));
if let Err(send_err) =
Copy link
Member

@whutchinson98 whutchinson98 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inspect err

ws_send(&message_sender_clone, FromWebSocketMessage::Error(e))
{
tracing::error!(error=?send_err, "failed to send chat access error");
}
continue;
}
Ok(access) => match access {
AccessLevel::View | AccessLevel::Comment => {
ws_send(
if let Err(send_err) = ws_send(
Copy link
Member

@whutchinson98 whutchinson98 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inspect err

&message_sender_clone,
FromWebSocketMessage::Error(WebSocketError::StreamError(
StreamError::Unauthorized {
stream_id: payload.stream_id,
},
)),
);
) {
tracing::error!(error=?send_err, "failed to send unauthorized error");
}
continue;
}
_ => (),
Expand All @@ -285,8 +296,10 @@ async fn handle_websocket_connection(
&connection_id,
&jwt_token
)) => {
if let Err(err) = result {
ws_send(&message_sender_clone, FromWebSocketMessage::Error(err.into()))
if let Err(err) = result
&& let Err(send_err) = ws_send(&message_sender_clone, FromWebSocketMessage::Error(err.into()))
{
tracing::error!(error=?send_err, "failed to send chat message error");
}
}
}
Expand All @@ -297,14 +310,16 @@ async fn handle_websocket_connection(
{
Ok(id) => Arc::new(id),
Err(_) => {
ws_send(
if let Err(send_err) = ws_send(
Copy link
Member

@whutchinson98 whutchinson98 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inspect err

&message_sender_clone,
FromWebSocketMessage::Error(WebSocketError::StreamError(
StreamError::InternalError {
stream_id: payload.stream_id.clone(),
},
)),
);
) {
tracing::error!(error=?send_err, "failed to send user id error");
}
continue;
}
};
Expand All @@ -321,19 +336,25 @@ async fn handle_websocket_connection(
.await
{
Err(e) => {
ws_send(&message_sender_clone, FromWebSocketMessage::Error(e));
if let Err(send_err) =
Copy link
Member

@whutchinson98 whutchinson98 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inspect err

ws_send(&message_sender_clone, FromWebSocketMessage::Error(e))
{
tracing::error!(error=?send_err, "failed to send chat access error");
}
continue;
}
Ok(access) => match access {
AccessLevel::View | AccessLevel::Comment => {
ws_send(
if let Err(send_err) = ws_send(
Copy link
Member

@whutchinson98 whutchinson98 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inspect err

&message_sender_clone,
FromWebSocketMessage::Error(WebSocketError::StreamError(
StreamError::Unauthorized {
stream_id: payload.stream_id,
},
)),
);
) {
tracing::error!(error=?send_err, "failed to send unauthorized error");
}
continue;
}
_ => (),
Expand All @@ -349,11 +370,13 @@ async fn handle_websocket_connection(
&jwt_token,
)
.await;
if let Err(err) = result {
ws_send(
if let Err(err) = result
Copy link
Member

@whutchinson98 whutchinson98 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inspect err

&& let Err(send_err) = ws_send(
&message_sender_clone,
FromWebSocketMessage::Error(err.into()),
)
{
tracing::error!(error=?send_err, "failed to send edit message error");
}
});
}
Expand All @@ -368,8 +391,10 @@ async fn handle_websocket_connection(
.map_err(|err| WebSocketError::FailedToSelectModel {
details: Some(err.to_string()),
})
&& let Err(send_err) =
ws_send(&message_sender_clone, FromWebSocketMessage::Error(err))
{
ws_send(&message_sender_clone, FromWebSocketMessage::Error(err));
tracing::error!(error=?send_err, "failed to send select model error");
}
}
ToWebSocketMessage::ExtractionStatus(payload) => {
Expand All @@ -382,8 +407,10 @@ async fn handle_websocket_connection(
)
.await
.map_err(|_err| WebSocketError::ExtractionStatusFailed { attachment_id })
&& let Err(send_err) =
ws_send(&message_sender_clone, FromWebSocketMessage::Error(err))
{
ws_send(&message_sender_clone, FromWebSocketMessage::Error(err))
tracing::error!(error=?send_err, "failed to send extraction status error");
}
}
ToWebSocketMessage::SendCompletion(payload) => {
Expand All @@ -395,21 +422,25 @@ async fn handle_websocket_connection(
user_id,
)
.await
&& let Err(send_err) =
ws_send(&message_sender_clone, FromWebSocketMessage::Error(err))
{
ws_send(&message_sender_clone, FromWebSocketMessage::Error(err))
tracing::error!(error=?send_err, "failed to send completion error");
}
}
ToWebSocketMessage::GetSimpleCompletionStream(payload) => {
let user_id = &user_context_clone.user_id;
let response = handle_simple_completion(
if let Err(err) = handle_simple_completion(
ctx_clone.clone(),
&message_sender_clone,
&payload,
user_id,
)
.await;
if let Err(err) = response {
ws_send(&message_sender_clone, FromWebSocketMessage::Error(err));
.await
&& let Err(send_err) =
ws_send(&message_sender_clone, FromWebSocketMessage::Error(err))
{
tracing::error!(error=?send_err, "failed to send simple completion error");
}
}
};
Expand All @@ -435,10 +466,13 @@ async fn handle_websocket_connection(
CONNECTION_MAP.remove(&connection_id);
}

pub fn ws_send(sender: &UnboundedSender<FromWebSocketMessage>, message: FromWebSocketMessage) {
if let Err(e) = sender.send(message) {
tracing::error!(error=%e, "failed to send message to channel");
}
pub fn ws_send(
Copy link
Member

@whutchinson98 whutchinson98 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you do tracing::instrument here you could have it automatically log errors for you so you don't need to map error each time

sender: &UnboundedSender<FromWebSocketMessage>,
message: FromWebSocketMessage,
) -> anyhow::Result<()> {
sender
.send(message)
.map_err(|e| anyhow::anyhow!("failed to send message to channel: {}", e))
}

/// Errors that can occur when checking the user quota
Expand Down
9 changes: 8 additions & 1 deletion rust/cloud-storage/document_cognition_service/src/api/ws/edit_message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ pub async fn handle_edit_last_user_message(
message_id: message_id.clone(),
chat_id: incoming_message.chat_id.clone(),
},
);
)
.map_err(|err| {
tracing::error!(error=?err, "failed to send chat message ack");
StreamWebSocketError::FailedToEditMessage {
reason: "failed to send message".to_string(),
stream_id: incoming_message.stream_id.clone(),
}
})?;

// delete last messages and message after if it exists
let mut last = chat.messages.iter().rev().take(2).collect::<Vec<_>>();
Expand Down
Loading
Loading