Skip to content

Migrate to Axum #4409

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

Draft
jcjones wants to merge 17 commits into
base: main
Choose a base branch
from
Draft

Migrate to Axum #4409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e902c8a
Migrate to Axum
jcjones Mar 2, 2026
3521a7e
Migrate server infrastructure and remaining lib code from trillium to…
jcjones Mar 3, 2026
764859c
Aggregator updates
jcjones Mar 3, 2026
d2df7d1
Interop Binaries and Integration Tests
jcjones Mar 3, 2026
daa2d6b
Migrate tests and remove trillium dependencies
jcjones Mar 3, 2026
10bbd1b
Fix some tests
jcjones Mar 3, 2026
ccdf423
lint fixes
jcjones Mar 3, 2026
ccc833c
Merge remote-tracking branch 'origin/main' into 4283-migrate-to-axum
jcjones Mar 4, 2026
68a1ef4
Fix post-migration regressions from code review
jcjones Mar 4, 2026
703c013
Address remaining code review issues from migration audit
jcjones Mar 4, 2026
bd5e011
Framework for handling cancellation
jcjones Mar 4, 2026
23fc663
Fix interop proxy response headers and add CancellationToken support …
jcjones Mar 4, 2026
5480910
Fix proxy multi-valued headers and add upload-resp TODO
jcjones Mar 4, 2026
e78e797
Extract HTTP metrics middleware into aggregator_core and wire up for …
jcjones Mar 4, 2026
a68dbac
Fix CloneCounterObserver missed wakeup by using notify_waiters
jcjones Mar 4, 2026
1b817c5
Restore origin-echoing CORS behavior for public endpoints
jcjones Mar 4, 2026
fb808a4
Revert the visibility of aggregator_api's CONTENT_TYPE
jcjones Mar 4, 2026
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
411 changes: 103 additions & 308 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 5 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ version = "0.9.0-prerelease-1"

[workspace.dependencies]
anyhow = "1"
axum = "0.8"
axum-extra = "0.10"
assert_matches = "1"
async-stream = "0.3"
async-trait = "0.1"
Expand Down Expand Up @@ -114,20 +116,13 @@ tracing-opentelemetry = "0.28"
tracing-stackdriver = "0.10.0"
tracing-subscriber = "0.3"
tokio = { version = "1.49", features = ["full", "tracing"] }
tokio-util = "0.7"
tower = "0.5"
tower-http = { version = "0.6", features = ["cors", "trace"] }
tokio-postgres = "0.7.16"
tokio-postgres-rustls = "0.13.0"
tokio-stream = "0.1.18"
trillium = "0.2.20"
trillium-api = { version = "0.2.0-rc.12", default-features = false }
trillium-caching-headers = "0.2.3"
trillium-head = "0.2.3"
trillium-macros = "0.0.6"
trillium-opentelemetry = "0.10.0"
trillium-prometheus = "0.2.0"
trillium-proxy = { version = "0.5.5", default-features = false }
trillium-router = "0.4.1"
trillium-rustls = "0.9"
trillium-testing = "0.7.0"
trillium-tokio = "0.4.0"
trycmd = "1.0.0"
url = { version = "2.5.8", features = ["serde"] }
Expand Down
17 changes: 4 additions & 13 deletions aggregator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ otlp = [
prometheus = [
"dep:opentelemetry-prometheus",
"dep:prometheus",
"dep:trillium-prometheus",
]
test-util = [
"janus_aggregator_core/test-util",
"janus_core/test-util",
"janus_messages/test-util",
"opentelemetry_sdk/testing",
"dep:testcontainers",
"dep:trillium-testing",
]

[dependencies]
Expand All @@ -40,6 +38,7 @@ assert_matches = { workspace = true }
async-stream = { workspace = true }
async-trait = { workspace = true }
aws-lc-rs = { workspace = true }
axum = { workspace = true, features = ["macros"] }
backon = { workspace = true }
base64.workspace = true
bytes.workspace = true
Expand Down Expand Up @@ -92,22 +91,15 @@ thiserror.workspace = true
tokio.workspace = true
tokio-postgres = { workspace = true, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1", "array-impls"] }
tokio-postgres-rustls = { workspace = true }
tokio-util.workspace = true
tower.workspace = true
tower-http = { workspace = true, features = ["cors", "trace"] }
tracing = { workspace = true }
tracing-chrome = { workspace = true }
tracing-log = { workspace = true }
tracing-opentelemetry = { workspace = true, optional = true }
tracing-stackdriver = { workspace = true }
tracing-subscriber = { workspace = true, features = ["std", "env-filter", "fmt", "json"] }
trillium.workspace = true
trillium-api.workspace = true
trillium-caching-headers.workspace = true
trillium-head.workspace = true
trillium-macros = "0.0.6"
trillium-opentelemetry.workspace = true
trillium-prometheus = { workspace = true, optional = true }
trillium-router.workspace = true
trillium-testing = { workspace = true, optional = true }
trillium-tokio.workspace = true
url.workspace = true
uuid = { workspace = true, features = ["serde"] }

Expand All @@ -122,7 +114,6 @@ quickcheck_macros = { workspace = true }
rstest.workspace = true
tempfile = { workspace = true }
tokio = { workspace = true, features = ["net", "test-util"] } # ensure this remains compatible with the non-dev dependency
trillium-testing.workspace = true
trycmd = { workspace = true }
wait-timeout = { workspace = true }

Expand Down
Loading
Loading