Skip to content

Commit

Permalink
Merge branch 'master' into remove-unsupported-macos-15
Browse files Browse the repository at this point in the history
* master: (178 commits)
  ref(crons): Allow `_` in monitor slugs (#2100)
  fix(span-metrics): Scrub subdomains in metric tags (#2103)
  feat(normalization): Scrub span description URLs (#2095)
  feat(dynamic-sampling): Add possibility to run dynamic sampling from `sentry-relay` (#2091)
  ref(dynamic-config): Remove transaction metrics allowlist from Sentry (#2092)
  feat(protocol): Support old effective-directory format (#2048)
  ref(spans): Add more tags to span metrics (#2090)
  fix(server): Support HTTP half-close connections (#2089)
  ref(spans): Use transactions namespace with `span` prefix (#2087)
  ref(spans): Update span metrics feature flag name (#2086)
  feat(metrics): Extract more metrics from spans (#2080)
  build: Bump tempfile to remove flagged dependency (#2085)
  feat(filter): Add document_uri csp filter (#2059)
  build: Use jemalloc on Linux (#2084)
  ci(gha): add debugging for "Couldn'\''t write tracker file" issue (#2081)
  feat(crons): Pass-through minimal `sdk` field (#2073)
  fix(quota): Parse large limits (#2079)
  instr(server): More details on unexpected envelope drop (#2077)
  fix(ci): Skip flaky integration test (#2076)
  feat(dynamic-sampling): Add support for `trace.replay_id` in matching rules (#2070)
  ...
  • Loading branch information
jan-auer committed May 9, 2023
2 parents eee7396 + a7b910e commit c974258
Show file tree
Hide file tree
Showing 328 changed files with 56,328 additions and 8,661 deletions.
3 changes: 2 additions & 1 deletion .github/actions/changelog/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ module.exports = async ({github, context, core}) => {
pull_number: context.payload.pull_request.number,
});

if (pr.merged || pr.draft) {
// While in draft mode, skip the check because changelogs often cause merge conflicts.
if (pr.merged || pr.draft) {
return;
}

Expand Down
22 changes: 7 additions & 15 deletions .github/workflows/beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Beta CI

on:
schedule:
- cron: "11 7 * * 1,4"
- cron: "11 7 * * 1,4" # At 07:11 AM, only on Monday and Thursday

env:
CARGO_TERM_COLOR: always
Expand All @@ -25,21 +25,13 @@ jobs:
with:
submodules: recursive

- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
profile: minimal
override: true
components: clippy
- name: Install Rust Toolchain
run: |
rustup toolchain install ${{ matrix.rust }} --profile minimal --component clippy --no-self-update
rustup default ${{ matrix.rust }}
- name: Run Clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --workspace --all-targets --all-features --no-deps -- -D warnings
run: cargo clippy --workspace --all-targets --all-features --no-deps -- -D warnings

- name: Run Cargo Tests
uses: actions-rs/cargo@v1
with:
command: test
args: --workspace --all-features
run: cargo test --workspace --all-features
31 changes: 11 additions & 20 deletions .github/workflows/build_binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ jobs:
submodules: recursive

- name: Build in Docker
run: scripts/docker-build-linux.sh
run: |
# Get the latest stable rust toolchain version available
TOOLCHAIN=$(curl -s 'https://static.rust-lang.org/dist/channel-rust-stable.toml' | awk '/\[pkg.rust\]/ {getline;print;}' | sed -r 's/^version = "([0-9.]+) .*/\1/')
scripts/docker-build-linux.sh "$TOOLCHAIN"
env:
BUILD_ARCH: x86_64
RELAY_FEATURES: ssl
RELAY_FEATURES:

- name: Bundle Debug File
run: |
Expand All @@ -44,19 +47,13 @@ jobs:
with:
submodules: recursive

- uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true
- name: Install Rust Toolchain
run: rustup toolchain install stable --profile minimal --no-self-update

- name: Run Cargo Build
uses: actions-rs/cargo@v1
run: cargo build --manifest-path=relay/Cargo.toml --release
env:
CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO: packed
with:
command: build
args: --manifest-path=relay/Cargo.toml --release --features ssl

- name: Bundle dSYM
run: |
Expand All @@ -78,17 +75,11 @@ jobs:
with:
submodules: recursive

- uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true
- name: Install Rust Toolchain
run: rustup toolchain install stable --profile minimal --no-self-update

- name: Run Cargo Build
uses: actions-rs/cargo@v1
with:
command: build
args: --manifest-path=relay/Cargo.toml --release --features ssl
run: cargo build --manifest-path=relay/Cargo.toml --release

- name: Bundle PDB
run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ jobs:
with:
submodules: recursive

- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.target }}
profile: minimal
override: true
- name: Install Rust Toolchain
run: |
rustup set profile minimal
rustup toolchain install stable
rustup override set stable
rustup target add --toolchain stable ${{ matrix.target }}
- uses: actions/setup-python@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "Changelog"
on:
pull_request:
types: [opened, synchronize, reopened, edited]
types: [opened, synchronize, reopened, edited, ready_for_review]

jobs:
build:
Expand Down
Loading

0 comments on commit c974258

Please sign in to comment.