Merge branch 'master' into feature/no-cache

* master: 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) release: 21.1.0 ci: Fix clippy command invocation ci: Run clippy via the cargo action feat(server): Ingest and normalize sample rates (#910)
getsentry · Jan 27, 2021 · 841ceea · 841ceea
2 parents 0e1bb3a + ccf3b93
commit 841ceea
Show file tree

Hide file tree

Showing 35 changed files with 252 additions and 320 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,9 +1,9 @@
-# Default code owners 
+# Default code owners
 *   @getsentry/owners-ingest
 
 # Legal
 /LICENSE  @getsentry/owners-legal
 
 # Build & Releases
-/.github/workflows/release.yml  @getsentry/releases
+/.github/workflows/release*.yml  @getsentry/releases
 
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -33,9 +33,9 @@ jobs:
           components: clippy
 
       - name: Run clippy
-        uses: actions-rs/clippy-check@v1
+        uses: actions-rs/cargo@v1
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          command: clippy
           args: --all-features --workspace --tests --examples -- -D clippy::all
 
       - uses: actions-rs/cargo@v1

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,9 +52,9 @@ jobs:
           args: --all -- --check
 
       - name: Run Clippy
-        uses: actions-rs/clippy-check@v1
+        uses: actions-rs/cargo@v1
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          command: clippy
           args: --workspace --all-features --tests -- -D clippy::all
 
   test:

diff --git a/.github/workflows/release.yml → .github/workflows/release_binary.yml b/.github/workflows/release.yml → .github/workflows/release_binary.yml
@@ -1,4 +1,5 @@
 name: Release
+
 on:
   workflow_dispatch:
     inputs:
@@ -8,19 +9,23 @@ on:
       force:
         description: Force a release even when there are release-blockers (optional)
         required: false
+
   schedule:
     # We want the release to be at 9-10am Pacific Time
     # We also want it to be 1 hour before the on-prem release
     - cron: "0 17 15 * *"
+
 jobs:
   release:
     runs-on: ubuntu-latest
-    name: "Release a new version"
+    name: "Release a new Relay version"
+
     steps:
       - uses: actions/checkout@v2
         with:
           token: ${{ secrets.GH_RELEASE_PAT }}
           fetch-depth: 0
+
       - name: Prepare release
         uses: getsentry/action-prepare-release@v1
         env:

diff --git a/.github/workflows/release_library.yml b/.github/workflows/release_library.yml
@@ -0,0 +1,31 @@
+name: Release Library
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version to release
+        required: true
+      force:
+        description: Force a release even when there are release-blockers (optional)
+        required: false
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    name: "Release a new librelay version"
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GH_RELEASE_PAT }}
+          fetch-depth: 0
+
+      - name: Prepare release
+        uses: getsentry/action-prepare-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
+        with:
+          version: ${{ github.event.inputs.version }}
+          force: ${{ github.event.inputs.force }}
+          path: py
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,16 @@
 
 ## Unreleased
 
+**Internal**:
+
+- 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))
+
+## 21.1.0
+
 **Features**:
 
 - Support dynamic sampling for error events. ([#883](https://github.com/getsentry/relay/pull/883))
 
-
 **Bug Fixes**:
 
 - Make all fields but event-id optional to fix regressions in user feedback ingestion. ([#886](https://github.com/getsentry/relay/pull/886))
@@ -17,6 +22,7 @@
 
 - Extract crashpad annotations into contexts. ([#892](https://github.com/getsentry/relay/pull/892))
 - Normalize user reports during ingestion and create empty fields. ([#903](https://github.com/getsentry/relay/pull/903))
+- Ingest and normalize sample rates from envelope item headers. ([#910](https://github.com/getsentry/relay/pull/910))
 
 ## 20.12.1
 
@@ -45,7 +51,7 @@
 
 **Internal**:
 
-- 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))
+- 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))
 - 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))
 - 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))
 - Emit metrics for outcomes in external relays. ([#851](https://github.com/getsentry/relay/pull/851))

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/LICENSE b/LICENSE
@@ -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:          2023-12-15
+Change Date:          2024-01-15
 
 Change License:       Apache License, Version 2.0
 

diff --git a/py/.craft.yml b/py/.craft.yml
@@ -1,5 +1,5 @@
 ---
-minVersion: "0.13.2"
+minVersion: "0.16.1"
 github:
   owner: getsentry
   repo: relay
@@ -25,6 +25,6 @@ targets:
 
 requireNames:
   - /^sentry_relay-.*-py2.py3-none-macosx_10_15_x86_64.whl$/
-  - /^sentry_relay-.*-py2.py3-none-manylinux1_i686.whl$/
-  - /^sentry_relay-.*-py2.py3-none-manylinux1_x86_64.whl$/
+  - /^sentry_relay-.*-py2.py3-none-manylinux2010_i686.whl$/
+  - /^sentry_relay-.*-py2.py3-none-manylinux2010_x86_64.whl$/
   - /^sentry-relay-.*.zip$/
diff --git a/py/CHANGELOG.md b/py/CHANGELOG.md
@@ -1,8 +1,18 @@
 # Changelog
 
-## Unreleased
+## 0.8.2
 
+- Fix compile errors in the sdist with Rust 1.47 and later. ([#801](https://github.com/getsentry/relay/pull/801))
 - Emit more useful normalization meta data for invalid tags. ([#808](https://github.com/getsentry/relay/pull/808))
+- Internal refactoring such that validating of characters in tags no longer uses regexes internally. ([#814](https://github.com/getsentry/relay/pull/814))
+- Normalize `breadcrumb.ty` into `breadcrumb.type` for broken Python SDK versions. ([#824](https://github.com/getsentry/relay/pull/824))
+- Emit event errors and normalization errors for unknown breadcrumb keys. ([#824](https://github.com/getsentry/relay/pull/824))
+- Make `$error.value` `pii=true`. ([#837](https://github.com/getsentry/relay/pull/837))
+- Add protocol support for WASM. ([#852](https://github.com/getsentry/relay/pull/852))
+- Add missing fields for Expect-CT reports. ([#865](https://github.com/getsentry/relay/pull/865))
+- 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))
+- Fix a long-standing bug where log messages were not addressible as `$string`. ([#882](https://github.com/getsentry/relay/pull/882))
+- Use manylinux2010 to build releases instead of manylinux1 to fix issues with newer Rust. ([#917](https://github.com/getsentry/relay/pull/917))
 
 ## 0.8.1
 

diff --git a/py/manylinux.sh b/py/manylinux.sh
@@ -3,18 +3,19 @@ set -e
 
 # Install dependencies needed by our wheel
 echo "Installing packages..."
-yum -y -q -e 0 install gcc libffi-devel openssl101e-devel
+yum -y -q install gcc libffi-devel openssl-devel
 
-export OPENSSL_INCLUDE_DIR=/usr/include/openssl101e
-export I686_UNKNOWN_LINUX_GNU_OPENSSL_LIB_DIR=/usr/lib/openssl101e
-export X86_64_UNKNOWN_LINUX_GNU_OPENSSL_LIB_DIR=/usr/lib64/openssl101e
+export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/
 
 # Install Rust
 curl https://sh.rustup.rs -sSf | sh -s -- -y
 export PATH=~/.cargo/bin:$PATH
 
 # Build wheels
-which linux32 && LINUX32=linux32
+if [ "$AUDITWHEEL_ARCH" == "i686" ]; then
+  LINUX32=linux32
+fi
+
 $LINUX32 /opt/python/cp27-cp27mu/bin/python setup.py bdist_wheel
 
 # Audit wheels

diff --git a/relay-auth/Cargo.toml b/relay-auth/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["Sentry <oss@sentry.io>"]
 description = "Authentication and crypto for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
-version = "20.12.1"
+version = "21.1.0"
 edition = "2018"
 license-file = "../LICENSE"
 publish = false

diff --git a/relay-cabi/Cargo.toml b/relay-cabi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "relay-cabi"
-version = "0.8.1"
+version = "0.8.2"
 authors = ["Sentry <oss@sentry.io>"]
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"

diff --git a/relay-common/Cargo.toml b/relay-common/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["Sentry <oss@sentry.io>"]
 description = "Common utilities and crate re-exports for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
-version = "20.12.1"
+version = "21.1.0"
 edition = "2018"
 license-file = "../LICENSE"
 publish = false

diff --git a/relay-config/Cargo.toml b/relay-config/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["Sentry <oss@sentry.io>"]
 description = "Configuration for the Relay CLI and server"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
-version = "20.12.1"
+version = "21.1.0"
 edition = "2018"
 license-file = "../LICENSE"
 publish = false