better metrics + auto reset them after 24h

Author: ssMMiles

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "discord-api-proxy"
-version = "1.1.1"
+version = "1.2.0"
 edition = "2021"
 
 [features]

Cargo.toml

@@ -1,5 +1,5 @@
 # Discord API Proxy
-A transparent, Redis backed proxy for handling Discord's API ratelimits.
+A transparent, Redis backed proxy for handling Discord's API ratelimits. Designed for use in any distributed environment that needs to interact with the Discord API, this service will centralize and nicely handle all the ratelimiting for your client applications.
 
 ## Usage
 
@@ -15,9 +15,11 @@ docker run -d \
 
 Once up and running, just send your normal requests to `http://YOURPROXY/api/v*` instead of `https://discord.com/api/v*`.
 
-You'll get back all the same responses, except when you would have hit a ratelimit - then you'll get a 429 from the proxy with `x-sent-by-proxy` and `x-ratelimit-bucket` headers.
+You'll get back all the same responses, except when you would have hit a ratelimit - then you'll get a 429 from the proxy with `x-sent-by-proxy` and `x-ratelimit-bucket` headers as well as the usual ratelimiting headers.
 
-If you get a 429 from the proxy, you should just retry until it works. If it's happening a lot, just stop hitting them.
+## Metrics
+
+Metrics are enabled by default and can be accessed at `/metrics` on the proxy. They are exposed in the Prometheus format.
 
 #### Environment Variables
 | Name                       | Description                                                                                                                                                                                                                                                                                                 |
@@ -40,9 +42,6 @@ If you get a 429 from the proxy, you should just retry until it works. If it's h
 
 ## Warnings
 
-### Slightly Reduced Throughput
-When sending globally ratelimited requests, the proxy currently starts the 1s bucket time from when the first response is received as Discord never provide the exact time. This can cause the proxy to be slightly over-restrictive depending on your , with a bot where the global ratelimit is 50 only being allowed up to ~47 requests per second.
-
 ### HTTP2 Connection Drops
 These are caused by the underlying HTTP library, see https://github.com/hyperium/hyper/issues/2500. If you're seeing errors, you should use the `DISABLE_HTTP2` environment variable until the linked issue is resolved.
 

README.md

@@ -4,8 +4,8 @@ import { sleep } from 'k6';
 export const options = {
   stages: [
     { duration: '15s', target: 1000 },
-    { duration: '15s', target: 2000 },
-    { duration: '15m', target: 2000 },
+    { duration: '15s', target: 1500 },
+    { duration: '15m', target: 1500 },
     { duration: '15s', target: 0 }
   ],
 };

benchmarks/stress_test.js

@@ -67,6 +67,9 @@ pub struct ProxyEnvConfig {
 
     pub disable_http2: bool,
     pub clustered_redis: bool, // TODO: Clustered redis only really needs a small number of changes to the client as all keys are already namespaced, but it's not finished yet
+
+    #[cfg(feature = "metrics")]
+    pub metrics_ttl: u64,
 }
 
 pub enum EnvError {
@@ -184,6 +187,9 @@ impl AppEnvConfig {
         let host = get_envvar_with_default("HOST", "127.0.0.1".to_string());
         let port = get_and_parse_envvar::<u16>("PORT", 8080);
 
+        #[cfg(feature = "metrics")]
+        let metrics_ttl = get_and_parse_envvar::<u64>("METRICS_TTL", 86400000);
+
         Self {
             redis: Arc::new(RedisEnvConfig {
                 host: redis_host,
@@ -216,6 +222,9 @@ impl AppEnvConfig {
                 disable_http2,
 
                 clustered_redis,
+
+                #[cfg(feature = "metrics")]
+                metrics_ttl,
             }),
         }
     }

src/config.rs

@@ -11,16 +11,16 @@ const LARGE_SHARDING_INTERNAL_SHARD_RL: u16 = 25;
 
 #[derive(Deserialize)]
 struct GetGatewayBotResponse {
-    _url: String,
-    _shards: u16,
+    // url: String,
+    // shards: u16,
     session_start_limit: SessionStartLimit,
 }
 
 #[derive(Deserialize)]
 struct SessionStartLimit {
-    _total: u16,
-    _remaining: u16,
-    _reset_after: u64,
+    // total: u16,
+    // remaining: u16,
+    // reset_after: u64,
     max_concurrency: u16,
 }