Skip to content

Commit

Permalink
Merge branch 'master' into ref/axum
Browse files Browse the repository at this point in the history
* master:
  feat(normalization): Mark scrubbed transactions as sanitized (#1960)
  fix(pii): Scrub sensitive cookies (#1951)
  release: 23.3.1
  feat(pii-scrubbing): PII scrub span.data by default (#1953)
  test(scrubbing): Add tests for PII scrubbing in breadcrumb.data (#1955)
  build(deps): bump sentry-sdk from 1.11.0 to 1.14.0 (#1959)
  ref(envelope_manager): Remove from_registry calls from the service (#1956)
  cd: add placeholder deployment pipeline (#1954)
  Assert array fields are capped to 100 items (#1910)
  fix(pii): Early return if no text left (#1957)
  • Loading branch information
jan-auer committed Mar 24, 2023
2 parents 4e38bf9 + 606166f commit 6bc21b9
Show file tree
Hide file tree
Showing 52 changed files with 1,762 additions and 268 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Changelog

## Unreleased
## 23.3.1

**Features**:

- Indicate if OS-version may be frozen with '>=' prefix. ([#1945](https://github.com/getsentry/relay/pull/1945))
- Normalize monitor slug parameters into slugs. ([#1913](https://github.com/getsentry/relay/pull/1913))
- Smart trim loggers for Java platforms. ([#1941](https://github.com/getsentry/relay/pull/1941))

- PII scrub `span.data` by default. ([#1953](https://github.com/getsentry/relay/pull/1953))
- Scrub sensitive cookies. ([#1951](https://github.com/getsentry/relay/pull/1951)))

## 23.3.0

Expand Down
50 changes: 25 additions & 25 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided that you d
error-reporting or application monitoring features of the
Licensed Work.

Change Date: 2026-03-15
Change Date: 2026-03-22

Change License: Apache License, Version 2.0

Expand Down
26 changes: 26 additions & 0 deletions gocd/pipelines/relay.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# More information on gocd-flavor YAML can be found here:
# - https://github.com/tomzo/gocd-yaml-config-plugin#pipeline
# - https://www.notion.so/sentry/GoCD-New-Service-Quickstart-6d8db7a6964049b3b0e78b8a4b52e25d
format_version: 10
pipelines:
deploy-relay:
group: relay
lock_behavior: unlockWhenFinished
materials:
relay_repo:
git: [email protected]:getsentry/relay.git
shallow_clone: true
branch: master
destination: relay
stages:
# For now, this is just a placeholder so we can get deploy refs
# in GoCD for the purposes of ST deploys.
- deploy-production:
approval:
type: manual
jobs:
deploy:
elastic_profile_id: relay
tasks:
- script: |
true
2 changes: 2 additions & 0 deletions py/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
## Unreleased

- Add `thread.state` field to protocol. ([#1896](https://github.com/getsentry/relay/pull/1896))
- PII scrub `span.data` by default. ([#1953](https://github.com/getsentry/relay/pull/1953))
- Scrub sensitive cookies. ([#1951](https://github.com/getsentry/relay/pull/1951))

## 0.8.19

Expand Down
2 changes: 1 addition & 1 deletion relay-auth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["Sentry <[email protected]>"]
description = "Authentication and crypto for Relay"
homepage = "https://getsentry.github.io/relay/"
repository = "https://github.com/getsentry/relay"
version = "23.3.0"
version = "23.3.1"
edition = "2021"
license-file = "../LICENSE"
publish = false
Expand Down
2 changes: 1 addition & 1 deletion relay-aws-extension/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["Sentry <[email protected]>"]
description = "AWS extension implementation for Sentry's AWS Lambda layer"
homepage = "https://getsentry.github.io/relay/"
repository = "https://github.com/getsentry/relay"
version = "23.3.0"
version = "23.3.1"
edition = "2021"
license-file = "../LICENSE"
publish = false
Expand Down
2 changes: 1 addition & 1 deletion relay-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["Sentry <[email protected]>"]
description = "Common utilities and crate re-exports for Relay"
homepage = "https://getsentry.github.io/relay/"
repository = "https://github.com/getsentry/relay"
version = "23.3.0"
version = "23.3.1"
edition = "2021"
license-file = "../LICENSE"
publish = false
Expand Down
2 changes: 1 addition & 1 deletion relay-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["Sentry <[email protected]>"]
description = "Configuration for the Relay CLI and server"
homepage = "https://getsentry.github.io/relay/"
repository = "https://github.com/getsentry/relay"
version = "23.3.0"
version = "23.3.1"
edition = "2021"
license-file = "../LICENSE"
publish = false
Expand Down
2 changes: 1 addition & 1 deletion relay-crash/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["Sentry <[email protected]>"]
description = "Native crash reporting for Relay"
homepage = "https://getsentry.github.io/relay/"
repository = "https://github.com/getsentry/relay"
version = "23.3.0"
version = "23.3.1"
edition = "2021"
build = "build.rs"
license-file = "../LICENSE"
Expand Down
2 changes: 1 addition & 1 deletion relay-dynamic-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["Sentry <[email protected]>"]
description = "Dynamic configuration passed down from sentry"
homepage = "https://getsentry.github.io/relay/"
repository = "https://github.com/getsentry/relay"
version = "23.3.0"
version = "23.3.1"
edition = "2021"
license-file = "../LICENSE"
publish = false
Expand Down
2 changes: 1 addition & 1 deletion relay-ffi-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["Sentry <[email protected]>"]
description = "Macros for error handling in FFI bindings"
homepage = "https://getsentry.github.io/relay/"
repository = "https://github.com/getsentry/relay"
version = "23.3.0"
version = "23.3.1"
edition = "2021"
license-file = "../LICENSE"
publish = false
Expand Down
2 changes: 1 addition & 1 deletion relay-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["Sentry <[email protected]>"]
description = "Utilities for error handling in FFI bindings"
homepage = "https://getsentry.github.io/relay/"
repository = "https://github.com/getsentry/relay"
version = "23.3.0"
version = "23.3.1"
edition = "2021"
license-file = "../LICENSE"
publish = false
Expand Down
2 changes: 1 addition & 1 deletion relay-filter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["Sentry <[email protected]>"]
description = "Inbound data filters for Relay"
homepage = "https://getsentry.github.io/relay/"
repository = "https://github.com/getsentry/relay"
version = "23.3.0"
version = "23.3.1"
edition = "2021"
license-file = "../LICENSE"
publish = false
Expand Down
2 changes: 1 addition & 1 deletion relay-general/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "relay-general"
version = "23.3.0"
version = "23.3.1"
authors = ["Sentry <[email protected]>"]
homepage = "https://getsentry.github.io/relay/"
repository = "https://github.com/getsentry/relay"
Expand Down
2 changes: 1 addition & 1 deletion relay-general/derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "relay-general-derive"
version = "23.3.0"
version = "23.3.1"
authors = ["Sentry <[email protected]>"]
homepage = "https://getsentry.github.io/relay/"
repository = "https://github.com/getsentry/relay"
Expand Down
4 changes: 4 additions & 0 deletions relay-general/src/pii/builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ declare_builtin_rules! {
ty: RuleType::Anything,
redaction: Redaction::Mask,
};
"@anything:filter" => RuleSpec {
ty: RuleType::Anything,
redaction: Redaction::Replace(ReplaceRedaction::default()),
};

// ip rules
"@ip" => rule_alias!("@ip:replace");
Expand Down
Loading

0 comments on commit 6bc21b9

Please sign in to comment.