Upgrade to twilight 0.17

- **Major change** The pretty metric route names are replaced with raw
  paths
- Non-standard global rate limits are unsupported

Author: vilgotf

Cargo.lock

@@ -16,7 +16,7 @@ tokio = { version = "1.43", features = ["rt-multi-thread", "macros", "signal"] }
 tokio-util = { version = "0.7.8", default-features = false, features = ["time"] }
 tracing = "0.1"
 tracing-subscriber = "0.3"
-twilight-http-ratelimiting = { version = "0.16.0" }
+twilight-http-ratelimiting = { git = "https://github.com/twilight-rs/twilight.git", branch = "next" }
 
 metrics = { version = "0.24", optional = true }
 metrics-exporter-prometheus = { version = "0.17", default-features = false, optional = true }

Cargo.toml

@@ -130,10 +130,8 @@ If processing an incoming request fails, the proxy will respond with a 5xx
 status code and a helpful error message in the response body. Currently, these
 status codes include:
 
-- `500` if the proxy generates an invalid URI or the ratelimiter fails
-  internally
-- `501` if the client requested an unsupported API path or used an unsupported
-  HTTP method
+- `500` if the proxy encountered an internal error
+- `501` if the client requested an unsupported API endpoint
 - `502` if the request made by the proxy fails
 
 [twilight]: https://github.com/twilight-rs/twilight

README.md

@@ -1,47 +1,26 @@
-use http::{Method, Response, uri::InvalidUri};
+use http::{Method, Response};
 use http_body_util::{BodyExt, Full, combinators::BoxBody};
 use hyper::body::Bytes;
 use hyper_util::client::legacy::Error as HyperUtilError;
 use std::{
     error::Error,
     fmt::{Display, Formatter, Result as FmtResult},
 };
-use twilight_http_ratelimiting::request::PathParseError;
 
-static ACQUIRING_TICKET_FAILED_MSG: &str =
-    "http-proxy: Acquiring ticket from the ratelimiter failed";
-static INVALID_URI_MSG: &str = "http-proxy: Failed to create URI for requesting Discord API";
 static INVALID_METHOD_MSG: &str = "http-proxy: Unsupported HTTP method in request";
-static INVALID_PATH_MSG: &str = "http-proxy: Failed to parse API path from client request";
 static REQUEST_ISSUE_MSG: &str = "http-proxy: Error requesting the Discord API";
 
 #[allow(clippy::module_name_repetitions)]
 #[derive(Debug)]
 pub enum RequestError {
-    AcquiringTicket {
-        source: Box<dyn Error + Send + Sync>,
-    },
-    InvalidMethod {
-        method: Method,
-    },
-    InvalidPath {
-        source: PathParseError,
-    },
-    InvalidURI {
-        source: InvalidUri,
-    },
-    RequestIssue {
-        source: HyperUtilError,
-    },
+    InvalidMethod { method: Method },
+    RequestIssue { source: HyperUtilError },
 }
 
 impl RequestError {
     pub fn as_response(&self) -> Response<BoxBody<Bytes, hyper::Error>> {
         let (status_code, body_incoming) = match self {
-            RequestError::AcquiringTicket { .. } => (500, ACQUIRING_TICKET_FAILED_MSG),
-            RequestError::InvalidURI { .. } => (500, INVALID_URI_MSG),
             RequestError::InvalidMethod { .. } => (501, INVALID_METHOD_MSG),
-            RequestError::InvalidPath { .. } => (501, INVALID_PATH_MSG),
             RequestError::RequestIssue { .. } => (502, REQUEST_ISSUE_MSG),
         };
 
@@ -57,22 +36,10 @@ impl RequestError {
 impl Display for RequestError {
     fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
         match self {
-            Self::AcquiringTicket { source } => {
-                f.write_str("error when acquiring ratelimiting ticket: ")?;
-                source.fmt(f)
-            }
             Self::InvalidMethod { method } => {
                 f.write_str("invalid method: ")?;
                 method.fmt(f)
             }
-            Self::InvalidPath { source } => {
-                f.write_str("invalid path: ")?;
-                source.fmt(f)
-            }
-            Self::InvalidURI { source } => {
-                f.write_str("generated uri for discord api is invalid: ")?;
-                source.fmt(f)
-            }
             Self::RequestIssue { source } => {
                 f.write_str("error executing request: ")?;
                 source.fmt(f)