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) ...
getsentry · Feb 26, 2021 · e4c3e7d · e4c3e7d
2 parents 9fc78f2 + 2dff99e
commit e4c3e7d
Show file tree

Hide file tree

Showing 173 changed files with 9,097 additions and 2,929 deletions.
diff --git a/.craft.yml b/.craft.yml
@@ -1,11 +1,14 @@
 ---
-minVersion: "0.11.1"
+minVersion: "0.14.0"
 github:
   owner: getsentry
   repo: relay
 changelogPolicy: auto
+
 statusProvider:
   name: github
+artifactProvider:
+  name: github
 
 targets:
   - name: github
@@ -33,7 +36,7 @@ targets:
     name: docker
     source: us.gcr.io/sentryio/relay
     target: getsentry/relay
-    targetFormat: '{{{target}}}:latest'
+    targetFormat: "{{{target}}}:latest"
 
 requireNames:
   - /^relay-Darwin-x86_64$/

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1,9 @@
+# Default code owners
 *   @getsentry/owners-ingest
+
+# Legal
+/LICENSE  @getsentry/owners-legal
+
+# Build & Releases
+/.github/workflows/release*.yml  @getsentry/releases
+
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -0,0 +1,44 @@
+name: Beta CI
+
+on:
+  schedule:
+    - cron: "11 7 * * 1,4"
+
+env:
+  RUSTFLAGS: -Dwarnings
+
+jobs:
+  test-all:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust: [beta]
+
+    services:
+      redis: # https://docs.github.com/en/actions/guides/creating-redis-service-containers
+        image: redis
+        ports:
+          - 6379:6379
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          profile: minimal
+          override: true
+          components: clippy
+
+      - name: Run clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --all-features --workspace --tests --examples -- -D clippy::all
+
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --workspace --all-features
diff --git a/.github/workflows/build_binary.yml b/.github/workflows/build_binary.yml
@@ -22,19 +22,15 @@ jobs:
           RELAY_FEATURES: ssl
 
       - name: Bundle Debug File
-        run: zip -r relay-debug.zip target/x86_64-unknown-linux-gnu/release/relay.debug
-
-      - uses: actions/setup-node@v1
-
-      - name: Upload to Zeus
-        env:
-          ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
         run: |
-          npm install -D @zeus-ci/cli
-          npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
-          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
-          npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip" -n relay-Linux-x86_64-debug.zip relay-debug.zip
-          npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
+          cd target/x86_64-unknown-linux-gnu/release/
+          zip relay-Linux-x86_64-debug.zip relay.debug
+          mv relay relay-Linux-x86_64
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ github.sha }}
+          path: target/x86_64-unknown-linux-gnu/release/relay-Linux-x86_64*
 
   macos:
     name: macOS
@@ -58,19 +54,15 @@ jobs:
           args: --manifest-path=relay/Cargo.toml --release --features ssl
 
       - name: Bundle dSYM
-        run: zip -r relay-dsym.zip target/release/relay.dSYM
-
-      - uses: actions/setup-node@v1
-
-      - name: Upload to Zeus
-        env:
-          ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
         run: |
-          npm install -D @zeus-ci/cli
-          npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
-          npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/octet-stream" -n relay-Darwin-x86_64 target/release/relay
-          npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip" -n relay-Darwin-x86_64-dsym.zip relay-dsym.zip
-          npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
+          cd target/release
+          mv relay relay-Darwin-x86_64
+          zip -r relay-Darwin-x86_64-dsym.zip relay.dSYM
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ github.sha }}
+          path: target/release/relay-Darwin-x86_64*
 
   windows:
     name: Windows
@@ -96,16 +88,11 @@ jobs:
       - name: Bundle PDB
         run: |
           Install-Module 7Zip4PowerShell -Force -Verbose
-          7z a .\relay-pdb.zip .\target\release\relay.pdb
-
-      - uses: actions/setup-node@v1
+          cd target/release
+          7z a relay-Windows-x86_64-pdb.zip relay.pdb
+          mv relay.exe relay-Windows-x86_64.exe
 
-      - name: Upload to Zeus
-        env:
-          ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
-        run: |
-          npm install -D @zeus-ci/cli
-          npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
-          npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/octet-stream" -n relay-Windows-x86_64.exe target/release/relay.exe
-          npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip" -n relay-Windows-x86_64-pdb.zip relay-pdb.zip
-          npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ github.sha }}
+          path: target/release/relay-Windows-x86_64*
diff --git a/.github/workflows/build_library.yml b/.github/workflows/build_library.yml
@@ -25,16 +25,10 @@ jobs:
         env:
           BUILD_ARCH: ${{ matrix.build-arch }}
 
-      - uses: actions/setup-node@v1
-
-      - name: Upload to Zeus
-        env:
-          ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
-        run: |
-          npm install -D @zeus-ci/cli
-          npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
-          npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip+wheel" py/dist/*
-          npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ github.sha }}
+          path: py/dist/*
 
   macos:
     name: Python macOS
@@ -53,24 +47,18 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: 2.7
+          python-version: 3.7
 
       - name: Build Wheel
         run: |
           pip install wheel
           python setup.py bdist_wheel
         working-directory: py
 
-      - uses: actions/setup-node@v1
-
-      - name: Upload to Zeus
-        env:
-          ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
-        run: |
-          npm install -D @zeus-ci/cli
-          npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
-          npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip+wheel" py/dist/*
-          npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ github.sha }}
+          path: py/dist/*
 
   sdist:
     name: Python sdist
@@ -83,19 +71,13 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: 2.7
+          python-version: 3.7
 
       - name: Build sdist
         run: python setup.py sdist --format=zip
         working-directory: py
 
-      - uses: actions/setup-node@v1
-
-      - name: Upload to Zeus
-        env:
-          ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
-        run: |
-          npm install -D @zeus-ci/cli
-          npx zeus job update -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
-          npx zeus upload -b ${{ github.run_id }} -j ${{ github.job }} -t "application/zip+wheel" py/dist/*
-          npx zeus job update --status=passed -b ${{ github.run_id }} -j ${{ github.job }} -r ${{ github.sha }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ github.sha }}
+          path: py/dist/*
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,6 +9,9 @@ on:
 
   pull_request:
 
+env:
+  RUSTFLAGS: -Dwarnings
+
 jobs:
   lint:
     name: Lint
@@ -49,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:
@@ -130,7 +133,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [2.7, 3.7]
+        python-version: [3.7]
 
     # Skip redundant checks for binary releases
     if: "!startsWith(github.ref, 'refs/heads/release/')"
@@ -190,7 +193,7 @@ jobs:
         image: confluentinc/cp-kafka
         env:
           KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-          KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
+          KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://127.0.0.1:9092
           KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
           KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS: 1
         ports:

diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -10,6 +10,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
-      - run: npx danger@9.1.8 ci
+      - run: npx danger@10.5.3 ci
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -21,11 +21,9 @@ jobs:
         with:
           submodules: recursive
 
-      # compile with nightly for intra-doc-links
-      # see https://github.com/rust-lang/rfcs/blob/master/text/1946-intra-rustdoc-links.md
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: stable
           profile: minimal
           components: rust-docs
           override: true

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml