Merge branch 'master' into lcian/feat/log-kv-clean

Author: lcian

CHANGELOG.md

@@ -1,11 +1,27 @@
 # Changelog
 
-## Unreleased
+## 0.41.0
+
+### Breaking changes
+
+- feat(tracing): support combined EventFilters and EventMappings (#847) by @lcian
+  - `EventFilter` has been changed to a `bitflags` struct.
+  - It's now possible to map a `tracing` event to multiple items in Sentry by combining multiple event filters in the `event_filter`, e.g. `tracing::Level::ERROR => EventFilter::Event | EventFilter::Log`.
+  - It's also possible to use `EventMapping::Combined` to map a `tracing` event to multiple items in Sentry.
+  - `ctx` in the signatures of `event_from_event`, `breadcrumb_from_event` and `log_from_event` has been changed to take `impl Into<Option<&'context Context<'context, S>>>` to avoid cloning the `Context` when mapping to multiple items.
+
+### Features 
+
+- feat(core): emit debug log when calling capture_log but logs are disabled (#849) by @lcian
 
 ### Fixes
 
 - fix(logs): stringify u64 attributes greater than `i64::MAX` (#846) by @lcian
 
+### Dependencies
+
+- chore(deps): bump `anyhow` and disable its `backtrace` feature (#632) by @LunaBorowska
+
 ## 0.40.0
 
 ### Breaking changes

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sentry-actix"
-version = "0.40.0"
+version = "0.41.0"
 authors = ["Sentry <hello@sentry.io>"]
 license = "MIT"
 readme = "README.md"
@@ -20,7 +20,7 @@ release-health = ["sentry-core/release-health"]
 actix-web = { version = "4", default-features = false }
 bytes = "1.2"
 futures-util = { version = "0.3.5", default-features = false }
-sentry-core = { version = "0.40.0", path = "../sentry-core", default-features = false, features = [
+sentry-core = { version = "0.41.0", path = "../sentry-core", default-features = false, features = [
     "client",
 ] }
 actix-http = "3.10"

sentry-actix/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sentry-anyhow"
-version = "0.40.0"
+version = "0.41.0"
 authors = ["Sentry <hello@sentry.io>"]
 license = "MIT"
 readme = "README.md"
@@ -14,12 +14,12 @@ rust-version = "1.81"
 
 [features]
 default = ["backtrace"]
-backtrace = ["anyhow/backtrace"]
+backtrace = []
 
 [dependencies]
-sentry-backtrace = { version = "0.40.0", path = "../sentry-backtrace" }
-sentry-core = { version = "0.40.0", path = "../sentry-core" }
-anyhow = "1.0.39"
+sentry-backtrace = { version = "0.41.0", path = "../sentry-backtrace" }
+sentry-core = { version = "0.41.0", path = "../sentry-core" }
+anyhow = "1.0.77"
 
 [dev-dependencies]
 sentry = { path = "../sentry", default-features = false, features = ["test"] }

sentry-anyhow/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sentry-backtrace"
-version = "0.40.0"
+version = "0.41.0"
 authors = ["Sentry <hello@sentry.io>"]
 license = "MIT"
 readme = "README.md"
@@ -18,4 +18,4 @@ regex = { version = "1.5.5", default-features = false, features = [
     "std",
     "unicode-perl",
 ] }
-sentry-core = { version = "0.40.0", path = "../sentry-core" }
+sentry-core = { version = "0.41.0", path = "../sentry-core" }

sentry-backtrace/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sentry-contexts"
-version = "0.40.0"
+version = "0.41.0"
 authors = ["Sentry <hello@sentry.io>"]
 license = "MIT"
 readme = "README.md"
@@ -14,7 +14,7 @@ edition = "2021"
 rust-version = "1.81"
 
 [dependencies]
-sentry-core = { version = "0.40.0", path = "../sentry-core" }
+sentry-core = { version = "0.41.0", path = "../sentry-core" }
 libc = "0.2.66"
 hostname = "0.4"
 

sentry-contexts/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sentry-core"
-version = "0.40.0"
+version = "0.41.0"
 authors = ["Sentry <hello@sentry.io>"]
 license = "MIT"
 readme = "README.md"
@@ -29,7 +29,7 @@ logs = []
 [dependencies]
 log = { version = "0.4.8", optional = true, features = ["std"] }
 rand = { version = "0.9.0", optional = true }
-sentry-types = { version = "0.40.0", path = "../sentry-types" }
+sentry-types = { version = "0.41.0", path = "../sentry-types" }
 serde = { version = "1.0.104", features = ["derive"] }
 serde_json = { version = "1.0.46" }
 uuid = { version = "1.0.0", features = ["v4", "serde"], optional = true }

sentry-core/Cargo.toml

@@ -99,7 +99,7 @@ functionality.
 [Sentry]: https://sentry.io/
 [`sentry`]: https://crates.io/crates/sentry
 [Unified API]: https://develop.sentry.dev/sdk/unified-api/
-[`test`]: https://docs.rs/sentry-core/0.40.0/sentry_core/test/index.html
+[`test`]: https://docs.rs/sentry-core/0.41.0/sentry_core/test/index.html
 
 ## Resources
 

sentry-core/README.md

@@ -464,7 +464,8 @@ impl Client {
     /// Captures a log and sends it to Sentry.
     #[cfg(feature = "logs")]
     pub fn capture_log(&self, log: Log, scope: &Scope) {
-        if !self.options().enable_logs {
+        if !self.options.enable_logs {
+            sentry_debug!("[Client] called capture_log, but options.enable_logs is set to false");
             return;
         }
         if let Some(log) = self.prepare_log(log, scope) {