getsentry · Swatinem · Feb 26, 2024 · Feb 20, 2024 · Feb 26, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -65,7 +65,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        rust: [1.68.0]
+        rust: [1.73.0]
 
     name: Check / Test MSRV on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## Unreleased
+
+**Compatiblity**:
+
+- Raised the MSRV to **1.73**.
+
+**Improvements**:
+
+- Slightly improved overhead of the `tracing` layer. ([#642](https://github.com/getsentry/sentry-rust/pull/642))
+
 ## 0.32.2
 
 ### Various fixes & improvements

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -93,14 +93,10 @@ best API and adding new features.
 We currently only verify this crate against a recent version of Sentry hosted on [sentry.io](https://sentry.io/) but it
 should work with on-prem Sentry versions 20.6 and later.
 
-The **Minimum Supported Rust Version** is currently at _1.68.0_.
-The Sentry crates will support a _6 months_ old Rust version at time of release,
+The **Minimum Supported Rust Version** is currently at _1.73.0_.
+The Sentry crates tries to support a _6 months_ old Rust version at time of release,
 and the MSRV will be increased in accordance with its dependencies.
 
-**Note**: Due to the misconfiguration in our workflow that verified the MSRV builds,
-we had to bump it all the way to _1.67.0_, breaking our own _6 months_ old rule.
-As of version _0.30.0_, the workflow has been fixed, and the MSRV will be enforced correctly.
-
 ## Resources
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.

diff --git a/clippy.toml b/clippy.toml
@@ -1 +1 @@
-msrv = "1.68.0"
+msrv = "1.73.0"
diff --git a/sentry-actix/Cargo.toml b/sentry-actix/Cargo.toml
@@ -10,12 +10,14 @@ description = """
 Sentry client extension for actix-web 3.
 """
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.73"
 
 [dependencies]
 actix-web = { version = "4", default-features = false }
 futures-util = { version = "0.3.5", default-features = false }
-sentry-core = { version = "0.32.2", path = "../sentry-core", default-features = false, features = ["client"] }
+sentry-core = { version = "0.32.2", path = "../sentry-core", default-features = false, features = [
+    "client",
+] }
 
 [dev-dependencies]
 actix-web = { version = "4" }

diff --git a/sentry-anyhow/Cargo.toml b/sentry-anyhow/Cargo.toml
@@ -10,7 +10,7 @@ description = """
 Sentry integration for anyhow.
 """
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.73"
 
 [features]
 default = ["backtrace"]

diff --git a/sentry-backtrace/Cargo.toml b/sentry-backtrace/Cargo.toml
@@ -10,10 +10,13 @@ description = """
 Sentry integration and utilities for dealing with stacktraces.
 """
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.73"
 
 [dependencies]
 backtrace = "0.3.44"
 once_cell = "1"
-regex = { version = "1.5.5", default-features = false, features = ["std", "unicode-perl"] }
+regex = { version = "1.5.5", default-features = false, features = [
+    "std",
+    "unicode-perl",
+] }
 sentry-core = { version = "0.32.2", path = "../sentry-core" }
diff --git a/sentry-contexts/Cargo.toml b/sentry-contexts/Cargo.toml
@@ -11,7 +11,7 @@ Sentry integration for os, device, and rust contexts.
 """
 build = "build.rs"
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.73"
 
 [dependencies]
 sentry-core = { version = "0.32.2", path = "../sentry-core" }

diff --git a/sentry-core/Cargo.toml b/sentry-core/Cargo.toml
@@ -10,7 +10,7 @@ description = """
 Core sentry library used for instrumentation and integration development.
 """
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.73"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -43,7 +43,10 @@ uuid = { version = "1.0.0", features = ["v4", "serde"], optional = true }
 # Because we re-export all the public API in `sentry`, we actually run all the
 # doctests using the `sentry` crate. This also takes care of the doctest
 # limitation documented in https://github.com/rust-lang/rust/issues/45599.
-sentry = { path = "../sentry", default-features = false, features = ["test", "transport"] }
+sentry = { path = "../sentry", default-features = false, features = [
+    "test",
+    "transport",
+] }
 anyhow = "1.0.30"
 criterion = "0.5"
 futures = "0.3.24"

diff --git a/sentry-debug-images/Cargo.toml b/sentry-debug-images/Cargo.toml
@@ -10,7 +10,7 @@ description = """
 Sentry integration that adds the list of loaded libraries to events.
 """
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.73"
 
 [dependencies]
 findshlibs = "=0.10.2"

diff --git a/sentry-log/Cargo.toml b/sentry-log/Cargo.toml
@@ -10,7 +10,7 @@ description = """
 Sentry integration for log and env_logger crates.
 """
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.73"
 
 [dependencies]
 sentry-core = { version = "0.32.2", path = "../sentry-core" }

diff --git a/sentry-panic/Cargo.toml b/sentry-panic/Cargo.toml
@@ -10,7 +10,7 @@ description = """
 Sentry integration for capturing panics.
 """
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.73"
 
 [dependencies]
 sentry-core = { version = "0.32.2", path = "../sentry-core" }

diff --git a/sentry-slog/Cargo.toml b/sentry-slog/Cargo.toml
@@ -10,7 +10,7 @@ description = """
 Sentry integration for the slog crate.
 """
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.73"
 
 [dependencies]
 sentry-core = { version = "0.32.2", path = "../sentry-core" }

diff --git a/sentry-tower/Cargo.toml b/sentry-tower/Cargo.toml
@@ -10,7 +10,7 @@ description = """
 Sentry integration for tower-based crates.
 """
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.73"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -25,7 +25,9 @@ tower-layer = "0.3"
 tower-service = "0.3"
 http = { version = "1.0.0", optional = true }
 pin-project = { version = "1.0.10", optional = true }
-sentry-core = { version = "0.32.2", path = "../sentry-core", default-features = false, features = ["client"] }
+sentry-core = { version = "0.32.2", path = "../sentry-core", default-features = false, features = [
+    "client",
+] }
 url = { version = "2.2.2", optional = true }
 
 [dev-dependencies]

diff --git a/sentry-tracing/Cargo.toml b/sentry-tracing/Cargo.toml
@@ -10,7 +10,7 @@ description = """
 Sentry integration for tracing and tracing-subscriber crates.
 """
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.73"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -20,9 +20,13 @@ default = []
 backtrace = ["dep:sentry-backtrace"]
 
 [dependencies]
-sentry-core = { version = "0.32.2", path = "../sentry-core", features = ["client"] }
+sentry-core = { version = "0.32.2", path = "../sentry-core", features = [
+    "client",
+] }
 tracing-core = "0.1"
-tracing-subscriber = { version = "0.3.1", default-features = false, features = ["std"] }
+tracing-subscriber = { version = "0.3.1", default-features = false, features = [
+    "std",
+] }
 sentry-backtrace = { version = "0.32.2", path = "../sentry-backtrace", optional = true }
 
 [dev-dependencies]

diff --git a/sentry-tracing/src/converters.rs b/sentry-tracing/src/converters.rs
@@ -4,7 +4,7 @@ use std::error::Error;
 use sentry_core::protocol::{Event, Exception, Mechanism, Thread, Value};
 use sentry_core::{event_from_error, Breadcrumb, Level, TransactionOrSpan};
 use tracing_core::field::{Field, Visit};
-use tracing_core::{span, Subscriber};
+use tracing_core::Subscriber;
 use tracing_subscriber::layer::Context;
 use tracing_subscriber::registry::LookupSpan;
 
@@ -42,7 +42,10 @@ fn extract_event_data(event: &tracing_core::Event) -> (Option<String>, FieldVisi
         // When #[instrument(err)] is used the event does not have a message attached to it.
         // the error message is attached to the field "error".
         .or_else(|| visitor.json_values.remove("error"))
-        .and_then(|v| v.as_str().map(|s| s.to_owned()));
+        .and_then(|v| match v {
+            Value::String(s) => Some(s),
+            _ => None,
+        });
 
     (message, visitor)
 }
@@ -93,22 +96,6 @@ where
     (message, visitor)
 }
 
-/// Extracts the message and metadata from a span
-pub(crate) fn extract_span_data(
-    attrs: &span::Attributes,
-) -> (Option<String>, BTreeMap<String, Value>) {
-    let mut data = FieldVisitor::default();
-    attrs.record(&mut data);
-
-    // Find message of the span, if any
-    let message = data
-        .json_values
-        .remove("message")
-        .and_then(|v| v.as_str().map(|s| s.to_owned()));
-
-    (message, data.json_values)
-}
-
 /// Records all fields of [`tracing_core::Event`] for easy access
 #[derive(Default)]
 pub(crate) struct FieldVisitor {