Skip to content

Commit 2707e66

Browse files
committed
Merge branch 'master' into release/docker-openssl-vendored
* master: fix(server): Log when recovering from network outages (#918) feat: Add a .no-cache option to event sending (#911) fix: Build proper 64-bit Linux wheel release: 0.8.2 chore: Switch to manylinux2010 (#917) meta(py): Changelog for 0.8.2 ci: Add an action to release the library (#916) ref: Remove Compatibility mode for Session Aggregates (#913)
2 parents 0c8c885 + 329cee5 commit 2707e66

File tree

24 files changed

+301
-277
lines changed

24 files changed

+301
-277
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Default code owners
1+
# Default code owners
22
* @getsentry/owners-ingest
33

44
# Legal
55
/LICENSE @getsentry/owners-legal
66

77
# Build & Releases
8-
/.github/workflows/release.yml @getsentry/releases
8+
/.github/workflows/release*.yml @getsentry/releases
99

.github/workflows/release.yml renamed to .github/workflows/release_binary.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Release
2+
23
on:
34
workflow_dispatch:
45
inputs:
@@ -8,19 +9,23 @@ on:
89
force:
910
description: Force a release even when there are release-blockers (optional)
1011
required: false
12+
1113
schedule:
1214
# We want the release to be at 9-10am Pacific Time
1315
# We also want it to be 1 hour before the on-prem release
1416
- cron: "0 17 15 * *"
17+
1518
jobs:
1619
release:
1720
runs-on: ubuntu-latest
18-
name: "Release a new version"
21+
name: "Release a new Relay version"
22+
1923
steps:
2024
- uses: actions/checkout@v2
2125
with:
2226
token: ${{ secrets.GH_RELEASE_PAT }}
2327
fetch-depth: 0
28+
2429
- name: Prepare release
2530
uses: getsentry/action-prepare-release@v1
2631
env:

.github/workflows/release_library.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Release Library
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: Version to release
8+
required: true
9+
force:
10+
description: Force a release even when there are release-blockers (optional)
11+
required: false
12+
13+
jobs:
14+
release:
15+
runs-on: ubuntu-latest
16+
name: "Release a new librelay version"
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
with:
21+
token: ${{ secrets.GH_RELEASE_PAT }}
22+
fetch-depth: 0
23+
24+
- name: Prepare release
25+
uses: getsentry/action-prepare-release@v1
26+
env:
27+
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
28+
with:
29+
version: ${{ github.event.inputs.version }}
30+
force: ${{ github.event.inputs.force }}
31+
path: py

CHANGELOG.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
**Features**:
6+
7+
- By adding `.no-cache` to the DSN key, Relay refreshes project configuration caches immediately. This allows to apply changed settings instantly, such as updates to data scrubbing or inbound filter rules. ([#911](https://github.com/getsentry/relay/pull/911))
8+
9+
**Bug Fixes**:
10+
11+
- Log on INFO level when recovering from network outages. ([#918](https://github.com/getsentry/relay/pull/918))
12+
13+
**Internal**:
14+
15+
- Compatibility mode for pre-aggregated sessions was removed. The feature is now enabled by default in full fidelity. ([#913](https://github.com/getsentry/relay/pull/913))
16+
317
## 21.1.0
418

519
**Features**:
620

721
- Support dynamic sampling for error events. ([#883](https://github.com/getsentry/relay/pull/883))
822

9-
1023
**Bug Fixes**:
1124

1225
- Make all fields but event-id optional to fix regressions in user feedback ingestion. ([#886](https://github.com/getsentry/relay/pull/886))
@@ -46,7 +59,7 @@
4659

4760
**Internal**:
4861

49-
- Add *experimental* support for picking up HTTP proxies from the regular environment variables. This feature needs to be enabled by setting `http: client: "reqwest"` in your `config.yml`. ([#839](https://github.com/getsentry/relay/pull/839))
62+
- Add _experimental_ support for picking up HTTP proxies from the regular environment variables. This feature needs to be enabled by setting `http: client: "reqwest"` in your `config.yml`. ([#839](https://github.com/getsentry/relay/pull/839))
5063
- Refactor transparent request forwarding for unknown endpoints. Requests are now entirely buffered in memory and occupy the same queues and actors as other requests. This should not cause issues but may change behavior under load. ([#839](https://github.com/getsentry/relay/pull/839))
5164
- Add reason codes to the `X-Sentry-Rate-Limits` header in store responses. This allows external Relays to emit outcomes with the proper reason codes. ([#850](https://github.com/getsentry/relay/pull/850))
5265
- Emit metrics for outcomes in external relays. ([#851](https://github.com/getsentry/relay/pull/851))

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

py/.craft.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
minVersion: "0.13.2"
2+
minVersion: "0.16.1"
33
github:
44
owner: getsentry
55
repo: relay
@@ -25,6 +25,6 @@ targets:
2525

2626
requireNames:
2727
- /^sentry_relay-.*-py2.py3-none-macosx_10_15_x86_64.whl$/
28-
- /^sentry_relay-.*-py2.py3-none-manylinux1_i686.whl$/
29-
- /^sentry_relay-.*-py2.py3-none-manylinux1_x86_64.whl$/
28+
- /^sentry_relay-.*-py2.py3-none-manylinux2010_i686.whl$/
29+
- /^sentry_relay-.*-py2.py3-none-manylinux2010_x86_64.whl$/
3030
- /^sentry-relay-.*.zip$/

py/CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
# Changelog
22

3-
## Unreleased
3+
## 0.8.2
44

5+
- Fix compile errors in the sdist with Rust 1.47 and later. ([#801](https://github.com/getsentry/relay/pull/801))
56
- Emit more useful normalization meta data for invalid tags. ([#808](https://github.com/getsentry/relay/pull/808))
7+
- Internal refactoring such that validating of characters in tags no longer uses regexes internally. ([#814](https://github.com/getsentry/relay/pull/814))
8+
- Normalize `breadcrumb.ty` into `breadcrumb.type` for broken Python SDK versions. ([#824](https://github.com/getsentry/relay/pull/824))
9+
- Emit event errors and normalization errors for unknown breadcrumb keys. ([#824](https://github.com/getsentry/relay/pull/824))
10+
- Make `$error.value` `pii=true`. ([#837](https://github.com/getsentry/relay/pull/837))
11+
- Add protocol support for WASM. ([#852](https://github.com/getsentry/relay/pull/852))
12+
- Add missing fields for Expect-CT reports. ([#865](https://github.com/getsentry/relay/pull/865))
13+
- Support more directives in CSP reports, such as `block-all-mixed-content` and `require-trusted-types-for`. ([#876](https://github.com/getsentry/relay/pull/876))
14+
- Fix a long-standing bug where log messages were not addressible as `$string`. ([#882](https://github.com/getsentry/relay/pull/882))
15+
- Use manylinux2010 to build releases instead of manylinux1 to fix issues with newer Rust. ([#917](https://github.com/getsentry/relay/pull/917))
616

717
## 0.8.1
818

py/manylinux.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ set -e
33

44
# Install dependencies needed by our wheel
55
echo "Installing packages..."
6-
yum -y -q -e 0 install gcc libffi-devel openssl101e-devel
6+
yum -y -q install gcc libffi-devel openssl-devel
77

8-
export OPENSSL_INCLUDE_DIR=/usr/include/openssl101e
9-
export I686_UNKNOWN_LINUX_GNU_OPENSSL_LIB_DIR=/usr/lib/openssl101e
10-
export X86_64_UNKNOWN_LINUX_GNU_OPENSSL_LIB_DIR=/usr/lib64/openssl101e
8+
export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/
119

1210
# Install Rust
1311
curl https://sh.rustup.rs -sSf | sh -s -- -y
1412
export PATH=~/.cargo/bin:$PATH
1513

1614
# Build wheels
17-
which linux32 && LINUX32=linux32
15+
if [ "$AUDITWHEEL_ARCH" == "i686" ]; then
16+
LINUX32=linux32
17+
fi
18+
1819
$LINUX32 /opt/python/cp27-cp27mu/bin/python setup.py bdist_wheel
1920

2021
# Audit wheels

relay-cabi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "relay-cabi"
3-
version = "0.8.1"
3+
version = "0.8.2"
44
authors = ["Sentry <[email protected]>"]
55
homepage = "https://getsentry.github.io/relay/"
66
repository = "https://github.com/getsentry/relay"

relay-common/src/project.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ impl ProjectKey {
5656
Ok(project_key)
5757
}
5858

59+
/// Parses a `ProjectKey` from a string with flags.
60+
pub fn parse_with_flags(key: &str) -> Result<(Self, Vec<&str>), ParseProjectKeyError> {
61+
let mut iter = key.split('.');
62+
let key = ProjectKey::parse(iter.next().ok_or(ParseProjectKeyError)?)?;
63+
Ok((key, iter.collect()))
64+
}
65+
5966
/// Returns the string representation of the project key.
6067
#[inline]
6168
pub fn as_str(&self) -> &str {

0 commit comments

Comments
 (0)