Skip to content

Commit e4c3e7d

Browse files
jan-auerjan-auer
committed
Merge branch 'master' into ref/get-value-macro
* master: (120 commits) fix(protocol): Deny backslashes in release names (#904) ref(server): Extract dynamic sampling functionality into own crate (#940) build: Switch to vendored openssl build (#914) feat(server): Add inbound filters functionality to dynamic sampling (#920) fix rule generation to new format (in tests) (#939) ref: Remove actix-web client, make reqwest the new http client (#938) fix(server): Reject empty envelopes with an explicit error (#937) fix(server): Ensure outcome data categories are numeric (#936) feat(stats): Add data category to TrackOutcome (#931) fix(pii): Make username pii-strippable (#935) build: Bump symbolic to 8.0.4 (#899) fix: Update to tokio 1.0 (#909) fix(pii): Make and/or work correctly with pii=maybe (#932) release: 21.2.0 release: 0.8.3 fix(build): Fix path to 3.7 (#930) build: drop python 2.7 support (#929) feat(protocol): Add snapshot to the stack trace interface (#927) test: Improve integration tests to reduce flakyness (#928) fix: Ignore false-positive lints from Clippy 1.50 (#926) ...
2 parents 9fc78f2 + 2dff99e commit e4c3e7d

File tree

173 files changed

+9097
-2929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+9097
-2929
lines changed

‎.craft.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
---
2-
minVersion: "0.11.1"
2+
minVersion: "0.14.0"
33
github:
44
owner: getsentry
55
repo: relay
66
changelogPolicy: auto
7+
78
statusProvider:
89
name: github
10+
artifactProvider:
11+
name: github
912

1013
targets:
1114
- name: github
@@ -33,7 +36,7 @@ targets:
3336
name: docker
3437
source: us.gcr.io/sentryio/relay
3538
target: getsentry/relay
36-
targetFormat: '{{{target}}}:latest'
39+
targetFormat: "{{{target}}}:latest"
3740

3841
requireNames:
3942
- /^relay-Darwin-x86_64$/

‎.github/CODEOWNERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1+
# Default code owners
12
* @getsentry/owners-ingest
3+
4+
# Legal
5+
/LICENSE @getsentry/owners-legal
6+
7+
# Build & Releases
8+
/.github/workflows/release*.yml @getsentry/releases
9+

‎.github/workflows/beta.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Beta CI
2+
3+
on:
4+
schedule:
5+
- cron: "11 7 * * 1,4"
6+
7+
env:
8+
RUSTFLAGS: -Dwarnings
9+
10+
jobs:
11+
test-all:
12+
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
rust: [beta]
16+
17+
services:
18+
redis: # https://docs.github.com/en/actions/guides/creating-redis-service-containers
19+
image: redis
20+
ports:
21+
- 6379:6379
22+
23+
steps:
24+
- uses: actions/checkout@v2
25+
with:
26+
submodules: recursive
27+
28+
- uses: actions-rs/toolchain@v1
29+
with:
30+
toolchain: ${{ matrix.rust }}
31+
profile: minimal
32+
override: true
33+
components: clippy
34+
35+
- name: Run clippy
36+
uses: actions-rs/cargo@v1
37+
with:
38+
command: clippy
39+
args: --all-features --workspace --tests --examples -- -D clippy::all
40+
41+
- uses: actions-rs/cargo@v1
42+
with:
43+
command: test
44+
args: --workspace --all-features

‎.github/workflows/build_binary.yml

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,15 @@ jobs:
2222
RELAY_FEATURES: ssl
2323

2424
- name: Bundle Debug File
25-
run: zip -r relay-debug.zip target/x86_64-unknown-linux-gnu/release/relay.debug
26-
27-
- uses: actions/setup-node@v1
28-
29-
- name: Upload to Zeus
30-
env:
31-
ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
3225
run: |
33-
npm install -D @zeus-ci/cli
34-
npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
35-
npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/octet-stream" -n relay-Linux-x86_64 target/x86_64-unknown-linux-gnu/release/relay
36-
npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip" -n relay-Linux-x86_64-debug.zip relay-debug.zip
37-
npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
26+
cd target/x86_64-unknown-linux-gnu/release/
27+
zip relay-Linux-x86_64-debug.zip relay.debug
28+
mv relay relay-Linux-x86_64
29+
30+
- uses: actions/upload-artifact@v2
31+
with:
32+
name: ${{ github.sha }}
33+
path: target/x86_64-unknown-linux-gnu/release/relay-Linux-x86_64*
3834

3935
macos:
4036
name: macOS
@@ -58,19 +54,15 @@ jobs:
5854
args: --manifest-path=relay/Cargo.toml --release --features ssl
5955

6056
- name: Bundle dSYM
61-
run: zip -r relay-dsym.zip target/release/relay.dSYM
62-
63-
- uses: actions/setup-node@v1
64-
65-
- name: Upload to Zeus
66-
env:
67-
ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
6857
run: |
69-
npm install -D @zeus-ci/cli
70-
npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
71-
npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/octet-stream" -n relay-Darwin-x86_64 target/release/relay
72-
npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip" -n relay-Darwin-x86_64-dsym.zip relay-dsym.zip
73-
npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
58+
cd target/release
59+
mv relay relay-Darwin-x86_64
60+
zip -r relay-Darwin-x86_64-dsym.zip relay.dSYM
61+
62+
- uses: actions/upload-artifact@v2
63+
with:
64+
name: ${{ github.sha }}
65+
path: target/release/relay-Darwin-x86_64*
7466

7567
windows:
7668
name: Windows
@@ -96,16 +88,11 @@ jobs:
9688
- name: Bundle PDB
9789
run: |
9890
Install-Module 7Zip4PowerShell -Force -Verbose
99-
7z a .\relay-pdb.zip .\target\release\relay.pdb
100-
101-
- uses: actions/setup-node@v1
91+
cd target/release
92+
7z a relay-Windows-x86_64-pdb.zip relay.pdb
93+
mv relay.exe relay-Windows-x86_64.exe
10294
103-
- name: Upload to Zeus
104-
env:
105-
ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
106-
run: |
107-
npm install -D @zeus-ci/cli
108-
npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
109-
npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/octet-stream" -n relay-Windows-x86_64.exe target/release/relay.exe
110-
npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip" -n relay-Windows-x86_64-pdb.zip relay-pdb.zip
111-
npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
95+
- uses: actions/upload-artifact@v2
96+
with:
97+
name: ${{ github.sha }}
98+
path: target/release/relay-Windows-x86_64*

‎.github/workflows/build_library.yml

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,10 @@ jobs:
2525
env:
2626
BUILD_ARCH: ${{ matrix.build-arch }}
2727

28-
- uses: actions/setup-node@v1
29-
30-
- name: Upload to Zeus
31-
env:
32-
ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
33-
run: |
34-
npm install -D @zeus-ci/cli
35-
npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
36-
npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip+wheel" py/dist/*
37-
npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
28+
- uses: actions/upload-artifact@v2
29+
with:
30+
name: ${{ github.sha }}
31+
path: py/dist/*
3832

3933
macos:
4034
name: Python macOS
@@ -53,24 +47,18 @@ jobs:
5347

5448
- uses: actions/setup-python@v2
5549
with:
56-
python-version: 2.7
50+
python-version: 3.7
5751

5852
- name: Build Wheel
5953
run: |
6054
pip install wheel
6155
python setup.py bdist_wheel
6256
working-directory: py
6357

64-
- uses: actions/setup-node@v1
65-
66-
- name: Upload to Zeus
67-
env:
68-
ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
69-
run: |
70-
npm install -D @zeus-ci/cli
71-
npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
72-
npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip+wheel" py/dist/*
73-
npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
58+
- uses: actions/upload-artifact@v2
59+
with:
60+
name: ${{ github.sha }}
61+
path: py/dist/*
7462

7563
sdist:
7664
name: Python sdist
@@ -83,19 +71,13 @@ jobs:
8371

8472
- uses: actions/setup-python@v2
8573
with:
86-
python-version: 2.7
74+
python-version: 3.7
8775

8876
- name: Build sdist
8977
run: python setup.py sdist --format=zip
9078
working-directory: py
9179

92-
- uses: actions/setup-node@v1
93-
94-
- name: Upload to Zeus
95-
env:
96-
ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
97-
run: |
98-
npm install -D @zeus-ci/cli
99-
npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
100-
npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip+wheel" py/dist/*
101-
npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
80+
- uses: actions/upload-artifact@v2
81+
with:
82+
name: ${{ github.sha }}
83+
path: py/dist/*

‎.github/workflows/ci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99

1010
pull_request:
1111

12+
env:
13+
RUSTFLAGS: -Dwarnings
14+
1215
jobs:
1316
lint:
1417
name: Lint
@@ -49,9 +52,9 @@ jobs:
4952
args: --all -- --check
5053

5154
- name: Run Clippy
52-
uses: actions-rs/clippy-check@v1
55+
uses: actions-rs/cargo@v1
5356
with:
54-
token: ${{ secrets.GITHUB_TOKEN }}
57+
command: clippy
5558
args: --workspace --all-features --tests -- -D clippy::all
5659

5760
test:
@@ -130,7 +133,7 @@ jobs:
130133
strategy:
131134
fail-fast: false
132135
matrix:
133-
python-version: [2.7, 3.7]
136+
python-version: [3.7]
134137

135138
# Skip redundant checks for binary releases
136139
if: "!startsWith(github.ref, 'refs/heads/release/')"
@@ -190,7 +193,7 @@ jobs:
190193
image: confluentinc/cp-kafka
191194
env:
192195
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
193-
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
196+
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://127.0.0.1:9092
194197
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
195198
KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS: 1
196199
ports:

‎.github/workflows/danger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v2
1212
- uses: actions/setup-node@v1
13-
- run: npx danger@9.1.8 ci
13+
- run: npx danger@10.5.3 ci
1414
env:
1515
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/deploy.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ jobs:
2121
with:
2222
submodules: recursive
2323

24-
# compile with nightly for intra-doc-links
25-
# see https://github.com/rust-lang/rfcs/blob/master/text/1946-intra-rustdoc-links.md
2624
- uses: actions-rs/toolchain@v1
2725
with:
28-
toolchain: nightly
26+
toolchain: stable
2927
profile: minimal
3028
components: rust-docs
3129
override: true

‎.github/workflows/release.yml

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)