Merge branch 'master' into lcian/ref/logs-feature-flag

Author: lcian

CHANGELOG.md

@@ -11,6 +11,8 @@
 
 ### Behavioral changes
 
+- ref(log): send logs by default when logs feature flag is enabled ([#915](https://github.com/getsentry/sentry-rust/pull/915)) by @lcian
+  - If the `logs` feature flag is enabled, the default Sentry `log` logger now sends logs for all events at or above INFO.
 - ref(logs): enable logs by default if logs feature flag is used ([#910](https://github.com/getsentry/sentry-rust/pull/910)) by @lcian
   - This changes the default value of `sentry::ClientOptions::enable_logs` to `true`.
   - This simplifies the setup of Sentry structured logs by requiring users to just add the `log` feature flag to the `sentry` dependency to opt-in to sending logs.

sentry-log/src/lib.rs

@@ -11,13 +11,10 @@
 //! - Records can be captured as traditional [logs](https://docs.sentry.io/product/explore/logs/)
 //!   Logs can be viewed and queried in the Logs explorer.
 //!
-//! By default anything above `Info` is recorded as a breadcrumb and
-//! anything above `Error` is captured as error event.
-//!
-//! To capture records as Sentry logs:
-//! 1. Enable the `logs` feature of the `sentry` crate.
-//! 2. Initialize the SDK with `enable_logs: true` in your client options.
-//! 3. Set up a custom filter (see below) to map records to logs (`LogFilter::Log`) based on criteria such as severity.
+//! By default anything at or above `Info` is recorded as a breadcrumb and
+//! anything at or above `Error` is captured as error event.
+//! Additionally, if the `sentry` crate is used with the `logs` feature flag, anything at or above `Info`
+//! is captured as a [Structured Log](https://docs.sentry.io/product/explore/logs/).
 //!
 //! # Examples
 //!

sentry-log/src/logger.rs

@@ -52,7 +52,13 @@ impl From<RecordMapping> for Vec<RecordMapping> {
 /// `warning` and `info`, and `debug` and `trace` logs are ignored.
 pub fn default_filter(metadata: &log::Metadata) -> LogFilter {
     match metadata.level() {
+        #[cfg(feature = "logs")]
+        log::Level::Error => LogFilter::Exception | LogFilter::Log,
+        #[cfg(not(feature = "logs"))]
         log::Level::Error => LogFilter::Exception,
+        #[cfg(feature = "logs")]
+        log::Level::Warn | log::Level::Info => LogFilter::Breadcrumb | LogFilter::Log,
+        #[cfg(not(feature = "logs"))]
         log::Level::Warn | log::Level::Info => LogFilter::Breadcrumb,
         log::Level::Debug | log::Level::Trace => LogFilter::Ignore,
     }