Skip to content
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.

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

ref: Add a tower-http feature as a shortcut #493

Merged
merged 1 commit into from
Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions sentry-contexts/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,19 @@ mod model_support {
let m = get_model().unwrap();
assert!(m.chars().all(|c| c != '\0'));
let f = get_family().unwrap();
assert!(f.chars().all(|c| !c.is_digit(10)));
assert!(f.chars().all(|c| !c.is_ascii_digit()));
}

#[test]
fn test_macos_version_and_build() {
let v = get_macos_version().unwrap();
assert!(v.chars().all(|c| c.is_digit(10) || c == '.'));
assert!(v.chars().all(|c| c.is_ascii_digit() || c == '.'));
let dot_count = v.split('.').count() - 1;
assert_eq!(dot_count, 2);
let b = get_macos_build().unwrap();
assert!(b.chars().all(|c| c.is_ascii_alphabetic() || c.is_digit(10)));
assert!(b
.chars()
.all(|c| c.is_ascii_alphabetic() || c.is_ascii_digit()));
}
}

Expand Down
2 changes: 1 addition & 1 deletion sentry-core/src/clientoptions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub type BeforeCallback<T> = Arc<dyn Fn(T) -> Option<T> + Send + Sync>;
///
/// See the [Documentation on Session Modes](https://develop.sentry.dev/sdk/sessions/#sdk-considerations)
/// for more information.
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum SessionMode {
/// Long running application session.
Application,
Expand Down
1 change: 1 addition & 0 deletions sentry-log/src/logger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ impl log::Log for NoopLogger {
pub struct SentryLogger<L: log::Log> {
dest: L,
filter: Box<dyn Fn(&log::Metadata<'_>) -> LogFilter + Send + Sync>,
#[allow(clippy::type_complexity)]
mapper: Option<Box<dyn Fn(&Record<'_>) -> RecordMapping + Send + Sync>>,
}

Expand Down
1 change: 1 addition & 0 deletions sentry-slog/src/drain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ pub fn default_filter(level: slog::Level) -> LevelFilter {
pub struct SentryDrain<D: Drain> {
drain: D,
filter: Box<dyn Fn(slog::Level) -> LevelFilter + Send + Sync>,
#[allow(clippy::type_complexity)]
mapper: Option<Box<dyn Fn(&Record, &OwnedKVList) -> RecordMapping + Send + Sync>>,
}

Expand Down
4 changes: 4 additions & 0 deletions sentry-types/src/protocol/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
//! This module exposes the types for the Sentry protocol in different versions.

// We would like to reserve the possibility to add floating point numbers to
// protocol types without breaking API (removing Eq) in the future.
#![allow(clippy::derive_partial_eq_without_eq)]

#[cfg(feature = "protocol")]
pub mod v7;

Expand Down
3 changes: 2 additions & 1 deletion sentry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ debug-images = ["sentry-debug-images"]
log = ["sentry-log"]
slog = ["sentry-slog"]
tower = ["sentry-tower"]
tower-http = ["sentry-tower", "sentry-tower/http"]
tracing = ["sentry-tracing"]
profiling = ["sentry-core/profiling"]
# other features
test = ["sentry-core/test"]
debug-logs = ["log_", "sentry-core/debug-logs"]
Expand All @@ -47,7 +49,6 @@ native-tls = ["reqwest_/default-tls"]
rustls = ["reqwest_/rustls-tls"]
ureq = ["ureq_/tls", "httpdate"]
ureq-native-tls = ["ureq_/native-tls", "httpdate"]
profiling = ["sentry-core/profiling"]

[dependencies]
sentry-core = { version = "0.27.0", path = "../sentry-core", features = ["client"] }
Expand Down