Skip to content

fix: Don't block on sending envelopes #546

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
merged 5 commits into from
Feb 3, 2023
Merged

fix: Don't block on sending envelopes #546

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
155bb0f
fix: Don't block on sending envelopes
loewenheim Feb 3, 2023
c3181ec
changelog
loewenheim Feb 3, 2023
475b6fb
Merge branch 'master' into fix/transport
loewenheim Feb 3, 2023
c221dc2
print error with sentry_debug
loewenheim Feb 3, 2023
110a37e
Changelog formatting
loewenheim Feb 3, 2023
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Fixes

- Envelopes will be discarded rather than blocking if the transport channel fills up. ([#546](https://github.com/getsentry/sentry-rust/pull/546))

## 0.29.2

### Various fixes & improvements
Expand Down
7 changes: 6 additions & 1 deletion sentry/src/transports/tokio_thread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,12 @@ impl TransportThread {
}

pub fn send(&self, envelope: Envelope) {
let _ = self.sender.send(Task::SendEnvelope(envelope));
// Using send here would mean that when the channel fills up for whatever
Copy link
Contributor

Choose a reason for hiding this comment

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

In JS we indeed just drop the envelope - https://github.com/getsentry/sentry-javascript/blob/e497bcda305a9c248dcdc78f48fe548cc58f8233/packages/core/src/transports/base.ts#L93-L104

// reason, trying to send an envelope would block everything. We'd rather
// drop the envelope in that case.
if let Err(e) = self.sender.try_send(Task::SendEnvelope(envelope)) {
sentry_debug!("envelope dropped: {e}");
}
}

pub fn flush(&self, timeout: Duration) -> bool {
Expand Down