Skip to content

build: Update axum and http #2844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Dec 18, 2023
Merged

build: Update axum and http #2844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
88e26ba
build: Update axum and http
jan-auer Dec 12, 2023
aa3e6d2
More fixes
jan-auer Dec 13, 2023
0c65be8
fix: Forward endpoint
jan-auer Dec 13, 2023
05403a4
fix: Build
jan-auer Dec 13, 2023
e284467
fix: Warning
jan-auer Dec 13, 2023
448a257
ref: Beautify server
jan-auer Dec 13, 2023
734caeb
fix: Replace axum-server with custom scaffolding
jan-auer Dec 14, 2023
895f3a5
ref: Revert SDK experiment
jan-auer Dec 14, 2023
46b98f2
fix: Lint
jan-auer Dec 14, 2023
e48eb9e
fix(forward): Properly filter headers
jan-auer Dec 15, 2023
0a8a272
fix: Review comments
jan-auer Dec 15, 2023
45521e4
fix: Improve comments
jan-auer Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
304 changes: 201 additions & 103 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions relay-log/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ chrono = { workspace = true, features = ["clock"], optional = true }
console = { version = "0.15.5", optional = true }
once_cell = { version = "1.13.1", optional = true }
relay-crash = { path = "../relay-crash", optional = true }
sentry = { version = "0.31.7", features = [
sentry = { version = "0.32.0", features = [
"debug-images",
"tower-axum-matched-path",
"tracing",
], optional = true }
sentry-core = { version = "0.31.7" }
sentry-core = { version = "0.32.0" }
tokio = { version = "1", default-features = false, features = [
"sync",
], optional = true }
Expand Down
17 changes: 11 additions & 6 deletions relay-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,27 @@ processing = [

[dependencies]
anyhow = { workspace = true }
axum = { version = "0.6.20", features = [
"headers",
axum = { version = "0.7.2", features = [
"macros",
"matched-path",
"multipart",
"tracing",
] }
axum-server = "0.4.7"
backoff = "0.4.0"
brotli = "3.3.4"
bytecount = "0.6.0"
bytes = { version = "1.4.0" }
bytes = { version = "1.5.0" }
chrono = { workspace = true, features = ["clock"] }
data-encoding = "2.3.3"
flate2 = "1.0.19"
futures = { workspace = true }
hash32 = { workspace = true }
hashbrown = { workspace = true }
hyper = { version = "1.0.1", features = ["http1", "http2", "server"] }
hyper-util = { git = "https://github.com/hyperium/hyper-util", rev = "99409f5c4059633b7e2fa8b9c2e6c110b0f2f64b", features = [
"server-auto",
"tokio",
] }
itertools = { workspace = true }
json-forensics = { version = "0.1.1" }
mime = "0.3.16"
Expand Down Expand Up @@ -83,6 +86,8 @@ relay-sampling = { path = "../relay-sampling" }
relay-spans = { path = "../relay-spans" }
relay-statsd = { path = "../relay-statsd" }
relay-system = { path = "../relay-system" }
# NOTE: When upgrading to a version of reqwest that depends on hyper/http 1.0, go to
# relay-server/src/endpoints/forward.rs and remove `mod legacy_shims`.
reqwest = { version = "0.11.1", features = [
"gzip",
"stream",
Expand All @@ -93,7 +98,7 @@ rmp-serde = "1.1.1"
rust-embed = { version = "8.0.0", optional = true }
serde = { workspace = true }
serde_json = { workspace = true }
smallvec = { workspace = true, features = ["drain_filter"] }
smallvec = { workspace = true, features = ["drain_filter"] }
sqlx = { version = "0.7.0", features = [
"macros",
"migrate",
Expand All @@ -107,7 +112,7 @@ symbolic-unreal = { version = "12.1.2", optional = true, default-features = fals
thiserror = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread"] }
tower = { version = "0.4.13", default-features = false }
tower-http = { version = "0.4.0", default-features = false, features = [
tower-http = { version = "0.5.0", default-features = false, features = [
"catch-panic",
"cors",
"decompression-br",
Expand Down
Loading