Skip to content

Commit 806f863

Browse files
authored
Merge branch 'master' into lcian/feat/twp
2 parents 787b64a + ae9779f commit 806f863

File tree

11 files changed

+21
-58
lines changed

11 files changed

+21
-58
lines changed

.github/workflows/danger.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Danger
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, edited, ready_for_review]
6+
7+
jobs:
8+
danger:
9+
uses: getsentry/github-workflows/.github/workflows/danger.yml@v2

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22

33
## Unreleased
44

5+
### Breaking changes
6+
7+
- refactor: remove `debug-logs` feature (#820) by @lcian
8+
- The deprecated `debug-logs` feature of the `sentry` crate, used for the SDK's own internal logging, has been removed.
9+
510
### Behavioral changes
611

712
- feat(core): implement Tracing without Performance (#811) by @lcian
813
- The SDK now implements Tracing without Performance, which makes it so that each `Scope` is associated with an object holding some tracing information.
914
- This information is used as a fallback when capturing an event with tracing disabled or otherwise no ongoing span, to still allow related events to be linked by a trace.
15+
- A new API `Scope::iter_trace_propagation_headers` has been provided that will use the fallback tracing information if there is no current `Span`.
1016

1117
## 0.38.1
1218

Cargo.lock

Lines changed: 0 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sentry-core/Cargo.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,12 @@ harness = false
2222
[features]
2323
default = []
2424
client = ["rand"]
25-
# I would love to just have a `log` feature, but this is used inside a macro,
26-
# and macros actually expand features (and extern crate) where they are used!
27-
debug-logs = ["dep:log"]
2825
test = ["client", "release-health"]
2926
release-health = []
3027

3128
[dependencies]
32-
cadence = { version = "1.4.0", optional = true }
33-
crc32fast = { version = "1.4.0", optional = true }
3429
log = { version = "0.4.8", optional = true, features = ["std"] }
3530
rand = { version = "0.9.0", optional = true }
36-
regex = { version = "1.7.3", optional = true }
3731
sentry-types = { version = "0.38.1", path = "../sentry-types" }
3832
serde = { version = "1.0.104", features = ["derive"] }
3933
serde_json = { version = "1.0.46" }

sentry-core/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ functionality.
9595
- `feature = "test"`: Activates the [`test`] module, which can be used to
9696
write integration tests. It comes with a test transport which can capture
9797
all sent events for inspection.
98-
- `feature = "debug-logs"`: Uses the `log` crate for debug output, instead
99-
of printing to `stderr`. This feature is **deprecated** and will be
100-
replaced by a dedicated log callback in the future.
10198

10299
[Sentry]: https://sentry.io/
103100
[`sentry`]: https://crates.io/crates/sentry

sentry-core/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@
9393
//! - `feature = "test"`: Activates the [`test`] module, which can be used to
9494
//! write integration tests. It comes with a test transport which can capture
9595
//! all sent events for inspection.
96-
//! - `feature = "debug-logs"`: Uses the `log` crate for debug output, instead
97-
//! of printing to `stderr`. This feature is **deprecated** and will be
98-
//! replaced by a dedicated log callback in the future.
9996
//!
10097
//! [Sentry]: https://sentry.io/
10198
//! [`sentry`]: https://crates.io/crates/sentry

sentry-core/src/macros.rs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,12 @@ macro_rules! with_client_impl {
5555
#[doc(hidden)]
5656
macro_rules! sentry_debug {
5757
($($arg:tt)*) => {
58-
#[cfg(feature = "debug-logs")] {
59-
::log::debug!(target: "sentry", $($arg)*);
60-
}
61-
#[cfg(not(feature = "debug-logs"))] {
62-
$crate::Hub::with(|hub| {
63-
if hub.client().map_or(false, |c| c.options().debug) {
64-
eprint!("[sentry] ");
65-
eprintln!($($arg)*);
66-
}
67-
});
68-
}
58+
$crate::Hub::with(|hub| {
59+
if hub.client().map_or(false, |c| c.options().debug) {
60+
eprint!("[sentry] ");
61+
eprintln!($($arg)*);
62+
}
63+
});
6964
}
7065
}
7166

sentry-opentelemetry/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ opentelemetry = { version = "0.29.0", default-features = false }
2323
opentelemetry_sdk = { version = "0.29.0", default-features = false, features = [
2424
"trace",
2525
] }
26-
opentelemetry-semantic-conventions = "0.29.0"
2726

2827
[dev-dependencies]
2928
sentry = { path = "../sentry", features = ["test", "opentelemetry"] }

sentry/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ tracing = ["sentry-tracing"]
4747
opentelemetry = ["sentry-opentelemetry"]
4848
# other features
4949
test = ["sentry-core/test"]
50-
debug-logs = ["dep:log", "sentry-core/debug-logs"]
5150
release-health = ["sentry-core/release-health", "sentry-actix?/release-health"]
5251
# transports
5352
transport = ["reqwest", "native-tls"]
@@ -74,7 +73,6 @@ sentry-slog = { version = "0.38.1", path = "../sentry-slog", optional = true }
7473
sentry-tower = { version = "0.38.1", path = "../sentry-tower", optional = true }
7574
sentry-tracing = { version = "0.38.1", path = "../sentry-tracing", optional = true }
7675
sentry-opentelemetry = { version = "0.38.1", path = "../sentry-opentelemetry", optional = true }
77-
log = { version = "0.4.8", optional = true, features = ["std"] }
7876
reqwest = { version = "0.12", optional = true, features = [
7977
"blocking",
8078
"json",

sentry/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ extra setup to function properly.
7676
| `test` | | | | |
7777
| `debug-images` || 🔌 | | |
7878
| `log` | | 🔌 | | Requires extra setup; See [`sentry-log`]'s documentation. |
79-
| `debug-logs` | | || Requires extra setup; See [`sentry-log`]'s documentation. |
8079
| `slog` | | 🔌 | | Requires extra setup; See [`sentry-slog`]'s documentation. |
8180
| `reqwest` || | | |
8281
| `native-tls` || | | `reqwest` must be enabled. |
@@ -110,7 +109,6 @@ extra setup to function properly.
110109
### Logging
111110
- `log`: Enables support for the `log` crate.
112111
- `slog`: Enables support for the `slog` crate.
113-
- `debug-logs`: **Deprecated**. Uses the `log` crate for internal logging.
114112

115113
### Transports
116114
- `reqwest`: **Default**. Enables the `reqwest` transport.

0 commit comments

Comments
 (0)