Skip to content

Commit 53acf2e

Browse files
committed
Merge branch 'master' into sebastian/scrub-spans-v2
2 parents 525ee9f + 203fdaf commit 53acf2e

30 files changed

+1143
-982
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
- Add `sentry.origin` attribute to OTLP logs. ([#5190](https://github.com/getsentry/relay/pull/5190))
1818
- Add new iPhone 17 devices. ([#5203](https://github.com/getsentry/relay/pull/5203))
1919
- Upgrade sqlparser and improve SQL parsing for span grouping. ([#5211](https://github.com/getsentry/relay/pull/5211))
20-
- Maps `unknown_error` span status to `internal_error` ([#5202](https://github.com/getsentry/relay/pull/5202))
20+
- Maps `unknown_error` span status to `internal_error`. ([#5202](https://github.com/getsentry/relay/pull/5202))
21+
- Add `otp` and `two[-_]factor` to default scrubbing rules. ([#5250](https://github.com/getsentry/relay/pull/5250))
2122
- Add event merging logic for Playstation crashes. ([#5228](https://github.com/getsentry/relay/pull/5228))
2223

2324
**Bug Fixes**:
@@ -27,6 +28,7 @@
2728

2829
**Internal**:
2930

31+
- Update most dependencies to semver compatible versions. ([#5245](https://github.com/getsentry/relay/pull/5245))
3032
- No longer writes Spans as trace items. ([#5152](https://github.com/getsentry/relay/pull/5152))
3133
- Removes support for the `otel_span` envelope item type. ([#5238](https://github.com/getsentry/relay/pull/5238))
3234
- Produce spans to `ingest-spans` by default. ([#5163](https://github.com/getsentry/relay/pull/5163))

0 commit comments

Comments
 (0)