Merge branch 'master' into lcian/feat/no-truncation

lcian · web-flow · commit e05ce91914d4 · 2025-11-24T10:10:37.000+01:00
diff --git a/README.md b/README.md
@@ -106,4 +106,4 @@ and the MSRV will be increased in accordance with its dependencies.
 ## Resources
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/README.tpl b/README.tpl
@@ -13,4 +13,4 @@
 License: {{license}}
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-actix/Cargo.toml b/sentry-actix/Cargo.toml
@@ -7,7 +7,7 @@ readme = "README.md"
 repository = "https://github.com/getsentry/sentry-rust"
 homepage = "https://sentry.io/welcome/"
 description = """
-Sentry client extension for actix-web 3.
+Sentry integration for actix-web 4.
 """
 edition = "2021"
 rust-version = "1.81"
diff --git a/sentry-actix/README.md b/sentry-actix/README.md
@@ -81,4 +81,4 @@ when processing a request, so that the rest of the processing will run with the
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-anyhow/README.md b/sentry-anyhow/README.md
@@ -49,4 +49,4 @@ capture backtraces with your events.  It is enabled by default.
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-backtrace/README.md b/sentry-backtrace/README.md
@@ -16,4 +16,4 @@ as integrations to process event stacktraces.
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-contexts/README.md b/sentry-contexts/README.md
@@ -28,4 +28,4 @@ let _sentry = sentry::init(sentry::ClientOptions::new().add_integration(integrat
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-core/Cargo.toml b/sentry-core/Cargo.toml
@@ -7,7 +7,7 @@ readme = "README.md"
 repository = "https://github.com/getsentry/sentry-rust"
 homepage = "https://sentry.io/welcome/"
 description = """
-Core sentry library used for instrumentation and integration development.
+Core Sentry library used for instrumentation and integration development.
 """
 edition = "2021"
 rust-version = "1.81"
diff --git a/sentry-core/README.md b/sentry-core/README.md
@@ -106,4 +106,4 @@ functionality.
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-debug-images/README.md b/sentry-debug-images/README.md
@@ -29,4 +29,4 @@ let integration = sentry_debug_images::DebugImagesIntegration::new()
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-log/Cargo.toml b/sentry-log/Cargo.toml
@@ -7,7 +7,7 @@ readme = "README.md"
 repository = "https://github.com/getsentry/sentry-rust"
 homepage = "https://sentry.io/welcome/"
 description = """
-Sentry integration for log and env_logger crates.
+Sentry integration for the log and env_logger crates.
 """
 edition = "2021"
 rust-version = "1.81"
diff --git a/sentry-log/README.md b/sentry-log/README.md
@@ -93,4 +93,4 @@ let logger = SentryLogger::new().mapper(|record| {
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-opentelemetry/README.md b/sentry-opentelemetry/README.md
@@ -94,4 +94,4 @@ tracer.in_span("example", |_| {
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-panic/README.md b/sentry-panic/README.md
@@ -27,4 +27,4 @@ let integration = sentry_panic::PanicIntegration::default().add_extractor(|info|
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-slog/README.md b/sentry-slog/README.md
@@ -77,4 +77,4 @@ provided.
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-tower/README.md b/sentry-tower/README.md
@@ -136,4 +136,4 @@ Applying the layers in the wrong order can result in memory leaks.
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-tracing/Cargo.toml b/sentry-tracing/Cargo.toml
@@ -7,7 +7,7 @@ readme = "README.md"
 repository = "https://github.com/getsentry/sentry-rust"
 homepage = "https://sentry.io/welcome/"
 description = """
-Sentry integration for tracing and tracing-subscriber crates.
+Sentry integration for the tracing and tracing-subscriber crates.
 """
 edition = "2021"
 rust-version = "1.81"
diff --git a/sentry-tracing/README.md b/sentry-tracing/README.md
@@ -248,4 +248,4 @@ async fn handle_request(headers: std::collections::HashMap<String, String>) {
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-types/README.md b/sentry-types/README.md
@@ -45,4 +45,4 @@ let event = v7::Event {
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
diff --git a/sentry-types/src/protocol/attachment.rs b/sentry-types/src/protocol/attachment.rs
@@ -3,10 +3,11 @@ use std::fmt;
 use serde::Deserialize;
 
 /// The different types an attachment can have.
-#[derive(Debug, Clone, Eq, PartialEq, Deserialize)]
+#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Default)]
 pub enum AttachmentType {
     #[serde(rename = "event.attachment")]
     /// (default) A standard attachment without special meaning.
+    #[default]
     Attachment,
     /// A minidump file that creates an error event and is symbolicated. The
     /// file should start with the `MDMP` magic bytes.
@@ -28,12 +29,6 @@ pub enum AttachmentType {
     Custom(String),
 }
 
-impl Default for AttachmentType {
-    fn default() -> Self {
-        Self::Attachment
-    }
-}
-
 impl AttachmentType {
     /// Gets the string value Sentry expects for the attachment type.
     pub fn as_str(&self) -> &str {
diff --git a/sentry-types/src/protocol/session.rs b/sentry-types/src/protocol/session.rs
@@ -13,10 +13,12 @@ use crate::utils::{ts_rfc3339, ts_rfc3339_opt};
 /// The Status of a Release Health Session.
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Deserialize, Serialize)]
 #[serde(rename_all = "snake_case")]
+#[derive(Default)]
 pub enum SessionStatus {
     /// The session is healthy.
     ///
     /// This does not necessarily indicate that the session is still active.
+    #[default]
     Ok,
     /// The session terminated normally.
     Exited,
@@ -26,12 +28,6 @@ pub enum SessionStatus {
     Abnormal,
 }
 
-impl Default for SessionStatus {
-    fn default() -> Self {
-        Self::Ok
-    }
-}
-
 /// An error used when parsing `SessionStatus`.
 #[derive(Debug, Error)]
 #[error("invalid session status")]
diff --git a/sentry/Cargo.toml b/sentry/Cargo.toml
@@ -7,7 +7,7 @@ readme = "README.md"
 repository = "https://github.com/getsentry/sentry-rust"
 homepage = "https://sentry.io/welcome/"
 description = """
-Sentry (getsentry.com) client for rust ;)
+Sentry (sentry.io) client for Rust.
 """
 edition = "2021"
 rust-version = "1.81"
diff --git a/sentry/README.md b/sentry/README.md
@@ -131,4 +131,4 @@ extra setup to function properly.
 License: MIT
 
 - [Discord](https://discord.gg/ez5KZN7) server for project discussions.
-- Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
+- Follow [@sentry](https://x.com/sentry) on X for updates.
