build: update axum dependency (#4450)

Cargo.toml

@@ -66,8 +66,8 @@ android_trace_log = { version = "0.3.0", features = ["serde"] }
 # which will increase processing time for transactions massively.
 # Keep it pinned until it's possible to disable backtrace.
 anyhow = "=1.0.69"
-axum = "0.7.9"
-axum-extra = "0.9.6"
+axum = "0.8.1"
+axum-extra = "0.10.0"
 axum-server = "0.7.1"
 arc-swap = "1.7.1"
 backoff = "0.4.0"

relay-server/src/endpoints/envelope.rs

@@ -69,7 +69,6 @@ impl EnvelopeParams {
     }
 }
 
-#[axum::async_trait]
 impl FromRequest<ServiceState> for EnvelopeParams {
     type Rejection = BadEnvelopeParams;
 

relay-server/src/endpoints/mod.rs

@@ -36,11 +36,11 @@ const BATCH_JSON_BODY_LIMIT: usize = 50_000_000; // 50 MB
 pub fn routes(config: &Config) -> Router<ServiceState>{
     // Relay-internal routes pointing to /api/relay/
     let internal_routes = Router::new()
-        .route("/api/relay/healthcheck/:kind/", get(health_check::handle))
-        .route("/api/relay/events/:event_id/", get(events::handle));
+        .route("/api/relay/healthcheck/{kind}/", get(health_check::handle))
+        .route("/api/relay/events/{event_id}/", get(events::handle));
     let internal_routes = internal_routes
         // Fallback route, but with a name, and just on `/api/relay/*`.
-        .route("/api/relay/*not_found", any(statics::not_found));
+        .route("/api/relay/{*not_found}", any(statics::not_found));
 
     // Sentry Web API routes pointing to /api/0/relays/
     let web_routes = Router::new()
@@ -60,22 +60,22 @@ pub fn routes(config: &Config) -> Router<ServiceState>{
         // Legacy store path that is missing the project parameter.
         .route("/api/store/", store::route(config))
         // cron monitor level routes.  These are user facing APIs and as such support trailing slashes.
-        .route("/api/:project_id/cron/:monitor_slug/:sentry_key", monitor::route(config))
-        .route("/api/:project_id/cron/:monitor_slug/:sentry_key/", monitor::route(config))
-        .route("/api/:project_id/cron/:monitor_slug", monitor::route(config))
-        .route("/api/:project_id/cron/:monitor_slug/", monitor::route(config))
+        .route("/api/{project_id}/cron/{monitor_slug}/{sentry_key}", monitor::route(config))
+        .route("/api/{project_id}/cron/{monitor_slug}/{sentry_key}/", monitor::route(config))
+        .route("/api/{project_id}/cron/{monitor_slug}", monitor::route(config))
+        .route("/api/{project_id}/cron/{monitor_slug}/", monitor::route(config))
 
-        .route("/api/:project_id/store/", store::route(config))
-        .route("/api/:project_id/envelope/", envelope::route(config))
-        .route("/api/:project_id/security/", security_report::route(config))
-        .route("/api/:project_id/csp-report/", security_report::route(config))
-        .route("/api/:project_id/nel/", nel::route(config))
+        .route("/api/{project_id}/store/", store::route(config))
+        .route("/api/{project_id}/envelope/", envelope::route(config))
+        .route("/api/{project_id}/security/", security_report::route(config))
+        .route("/api/{project_id}/csp-report/", security_report::route(config))
+        .route("/api/{project_id}/nel/", nel::route(config))
         // No mandatory trailing slash here because people already use it like this.
-        .route("/api/:project_id/minidump", minidump::route(config))
-        .route("/api/:project_id/minidump/", minidump::route(config))
-        .route("/api/:project_id/events/:event_id/attachments/", post(attachments::handle))
-        .route("/api/:project_id/unreal/:sentry_key/", unreal::route(config))
-        .route("/api/:project_id/otlp/v1/traces/", traces::route(config))
+        .route("/api/{project_id}/minidump", minidump::route(config))
+        .route("/api/{project_id}/minidump/", minidump::route(config))
+        .route("/api/{project_id}/events/{event_id}/attachments/", post(attachments::handle))
+        .route("/api/{project_id}/unreal/{sentry_key}/", unreal::route(config))
+        .route("/api/{project_id}/otlp/v1/traces/", traces::route(config))
         // NOTE: If you add a new (non-experimental) route here, please also list it in
         // https://github.com/getsentry/sentry-docs/blob/master/docs/product/relay/operating-guidelines.mdx
         .route_layer(middlewares::cors());

relay-server/src/extractors/content_type.rs

@@ -20,8 +20,7 @@ impl AsRef<str> for RawContentType {
     }
 }
 
-#[axum::async_trait]
-impl<S> FromRequestParts<S> for RawContentType {
+impl<S: Send + Sync> FromRequestParts<S> for RawContentType {
     type Rejection = Infallible;
 
     async fn from_request_parts(parts: &mut Parts, _: &S) -> Result<Self, Self::Rejection> {

relay-server/src/extractors/forwarded_for.rs

@@ -74,7 +74,6 @@ impl From<ForwardedFor> for String {
     }
 }
 
-#[axum::async_trait]
 impl<S> FromRequestParts<S> for ForwardedFor
 where
     S: Send + Sync,

relay-server/src/extractors/mime.rs

@@ -39,8 +39,7 @@ impl IntoResponse for MimeError {
     }
 }
 
-#[axum::async_trait]
-impl<S> FromRequestParts<S> for Mime {
+impl<S: Send + Sync> FromRequestParts<S> for Mime {
     type Rejection = MimeError;
 
     async fn from_request_parts(parts: &mut Parts, _: &S) -> Result<Self, Self::Rejection> {

relay-server/src/extractors/received_at.rs

@@ -15,7 +15,6 @@ impl ReceivedAt {
     }
 }
 
-#[axum::async_trait]
 impl<S> FromRequestParts<S> for ReceivedAt
 where
     S: Send + Sync,

relay-server/src/extractors/remote.rs

@@ -21,7 +21,6 @@ use crate::utils::{self, ApiErrorResponse};
 /// use crate::extractors::Remote;
 ///
 /// // Derive `FromRequest` for `bool` for illustration purposes:
-/// #[axum::async_trait]
 /// impl<S> axum::extract::FromRequest<S> for Remote<bool> {
 ///     type Rejection = Remote<Infallible>;
 ///
@@ -45,7 +44,6 @@ impl<T> From<T> for Remote<T> {
     }
 }
 
-#[axum::async_trait]
 impl FromRequest<ServiceState> for Remote<Multipart<'static>> {
     type Rejection = Remote<multer::Error>;
 

relay-server/src/extractors/request_meta.rs

@@ -460,7 +460,6 @@ impl PartialMeta {
     }
 }
 
-#[axum::async_trait]
 impl FromRequestParts<ServiceState> for PartialMeta {
     type Rejection = Infallible;
 
@@ -622,7 +621,6 @@ struct StorePath {
     sentry_key: Option<String>,
 }
 
-#[axum::async_trait]
 impl FromRequestParts<ServiceState> for RequestMeta {
     type Rejection = BadEventMeta;
 

relay-server/src/extractors/signed_json.rs

@@ -71,7 +71,6 @@ pub struct SignedBytes {
     pub relay: RelayInfo,
 }
 
-#[axum::async_trait]
 impl FromRequest<ServiceState> for SignedBytes {
     type Rejection = SignatureError;
 
@@ -105,7 +104,6 @@ pub struct SignedJson<T> {
     pub relay: RelayInfo,
 }
 
-#[axum::async_trait]
 impl<T> FromRequest<ServiceState> for SignedJson<T>
 where
     T: DeserializeOwned,

relay-server/src/middlewares/body_timing.rs

@@ -45,7 +45,7 @@ impl<S> BodyTiming<S> {
     }
 }
 
-impl<S> Service<Request<Body>> for BodyTiming<S>
+impl<S: Send + Sync> Service<Request<Body>> for BodyTiming<S>
 where
     S: Service<Request<Body>>,
 {

relay-server/src/middlewares/sentry_tower.rs

@@ -256,7 +256,7 @@ where
     H: Into<Arc<Hub>>,
 {
     provider: P,
-    _hub: PhantomData<(H, Request)>,
+    _hub: PhantomData<fn() -> (H, Request)>,
 }
 
 impl<S, P, H, Request> Layer<S> for SentryLayer<P, H, Request>
@@ -296,7 +296,7 @@ where
 {
     service: S,
     provider: P,
-    _hub: PhantomData<(H, Request)>,
+    _hub: PhantomData<fn() -> (H, Request)>,
 }
 
 impl<S, Request, P, H> Service<Request> for SentryService<S, P, H, Request>

relay-server/src/service.rs

@@ -496,7 +496,6 @@ fn initialize_redis_scripts(
     Ok(())
 }
 
-#[axum::async_trait]
 impl FromRequestParts<Self> for ServiceState {
     type Rejection = Infallible;