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

Author: lcian

CHANGELOG.md

@@ -1,14 +1,15 @@
 # Changelog
 
-## Unreleased
+## 0.43.0
 
 ### Breaking changes
 
 - ref(tracing): rework tracing to Sentry span name/op conversion ([#887](https://github.com/getsentry/sentry-rust/pull/887)) by @lcian
   - The `tracing` integration now uses the tracing span name as the Sentry span name by default.
-  - Before this change, the span name would be set based on the `tracing` span target (<module>::<function> when using the `tracing::instrument` macro).
-  - The `tracing` integration now uses `default` as the default Sentry span op.
+  - Before this change, the span name would be set based on the `tracing` span target (`<module>::<function>` when using the `tracing::instrument` macro).
+  - The `tracing` integration now uses `<span target>::<span name>` as the default Sentry span op (i.e. `<module>::<function>` when using `tracing::instrument`).
   - Before this change, the span op would be set based on the `tracing` span name.
+  - Read below to learn how to customize the span name and op.
   - When upgrading, please ensure to adapt any queries, metrics or dashboards to use the new span names/ops.
 - ref(tracing): use standard code attributes ([#899](https://github.com/getsentry/sentry-rust/pull/899)) by @lcian
   - Logs now carry the attributes `code.module.name`, `code.file.path` and `code.line.number` standardized in OTEL to surface the respective information, in contrast with the previously sent `tracing.module_path`, `tracing.file` and `tracing.line`.
@@ -17,6 +18,8 @@
   - Previously, if a middleware were to process the request after the Sentry middleware and return an error, our middleware would always capture it and send it to Sentry, regardless if it was a client, server or some other kind of error.
   - With this change, we capture errors returned by middleware only if those errors can be classified as server errors.
   - There is no change in behavior when it comes to errors returned by services, in which case the Sentry middleware only captures server errors exclusively.
+- fix: send trace origin correctly ([#906](https://github.com/getsentry/sentry-rust/pull/906)) by @lcian
+  - `TraceContext` now has an additional field `origin`, used to report which integration created a transaction.
 
 ### Behavioral changes
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sentry-actix"
-version = "0.42.0"
+version = "0.43.0"
 authors = ["Sentry <[email protected]>"]
 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.42.0", path = "../sentry-core", default-features = false, features = [
+sentry-core = { version = "0.43.0", path = "../sentry-core", default-features = false, features = [
     "client",
 ] }
 actix-http = "3.10"

sentry-actix/Cargo.toml

@@ -322,7 +322,7 @@ where
 
             let transaction = hub.start_transaction(ctx);
             transaction.set_request(sentry_req.clone());
-            transaction.set_data("origin", "auto.http.actix".into());
+            transaction.set_origin("auto.http.actix");
             Some(transaction)
         } else {
             None

sentry-actix/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "sentry-anyhow"
-version = "0.42.0"
+version = "0.43.0"
 authors = ["Sentry <[email protected]>"]
 license = "MIT"
 readme = "README.md"
@@ -17,8 +17,8 @@ default = ["backtrace"]
 backtrace = []
 
 [dependencies]
-sentry-backtrace = { version = "0.42.0", path = "../sentry-backtrace" }
-sentry-core = { version = "0.42.0", path = "../sentry-core" }
+sentry-backtrace = { version = "0.43.0", path = "../sentry-backtrace" }
+sentry-core = { version = "0.43.0", path = "../sentry-core" }
 anyhow = "1.0.77"
 
 [dev-dependencies]

sentry-anyhow/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sentry-backtrace"
-version = "0.42.0"
+version = "0.43.0"
 authors = ["Sentry <[email protected]>"]
 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.42.0", path = "../sentry-core" }
+sentry-core = { version = "0.43.0", path = "../sentry-core" }

sentry-backtrace/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sentry-contexts"
-version = "0.42.0"
+version = "0.43.0"
 authors = ["Sentry <[email protected]>"]
 license = "MIT"
 readme = "README.md"
@@ -14,7 +14,7 @@ edition = "2021"
 rust-version = "1.81"
 
 [dependencies]
-sentry-core = { version = "0.42.0", path = "../sentry-core" }
+sentry-core = { version = "0.43.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.42.0"
+version = "0.43.0"
 authors = ["Sentry <[email protected]>"]
 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.42.0", path = "../sentry-types" }
+sentry-types = { version = "0.43.0", path = "../sentry-types" }
 serde = { version = "1.0.104", features = ["derive"] }
 serde_json = { version = "1.0.46" }
 url = { version = "2.1.1" }

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.42.0/sentry_core/test/index.html
+[`test`]: https://docs.rs/sentry-core/0.43.0/sentry_core/test/index.html
 
 ## Resources
 

sentry-core/README.md

@@ -819,6 +819,12 @@ impl Transaction {
         }
     }
 
+    /// Sets the origin for this transaction, indicating what created it.
+    pub fn set_origin(&self, origin: &str) {
+        let mut inner = self.inner.lock().unwrap();
+        inner.context.origin = Some(origin.to_owned());
+    }
+
     /// Returns the headers needed for distributed tracing.
     /// Use [`crate::Scope::iter_trace_propagation_headers`] to obtain the active
     /// trace's distributed tracing headers.