config - use analytics_find_limit & analytics_maxtime

Author: elpiel

docs/config/dev.toml

@@ -7,8 +7,9 @@ spendable_find_limit = 200
 wait_time = 500
 
 msgs_find_limit = 10
-analytics_find_limit_v5 = 5000
-analytics_maxtime_v5 = 20000
+analytics_find_limit = 5000
+# in milliseconds
+analytics_maxtime = 20000
 
 heartbeat_time = 30000
 health_threshold_promilles = 950

docs/config/ganache.toml

@@ -1,37 +1,32 @@
-# based on: prod.toml
 # Maximum number of channels to return per request
 max_channels = 512
 
-channels_find_limit = 512
-campaigns_find_limit = 512
-spendable_find_limit = 512
-
-wait_time = 40000
-
-# V4 Deprecated
-aggr_throttle = 0
-
-events_find_limit = 100
+channels_find_limit = 200
+campaigns_find_limit = 200
+spendable_find_limit = 200
+wait_time = 500
 
 msgs_find_limit = 10
-analytics_find_limit_v5 = 5000
-analytics_maxtime_v5 = 15000
+analytics_find_limit = 5000
+# in milliseconds
+analytics_maxtime = 20000
 
-heartbeat_time = 60000
-health_threshold_promilles = 970
-health_unsignable_promilles = 770
-propagation_timeout = 3000
+heartbeat_time = 30000
+health_threshold_promilles = 950
+health_unsignable_promilles = 750
+propagation_timeout = 1000
 
-fetch_timeout = 10000
-all_campaigns_timeout = 10000
-channel_tick_timeout = 10000
+fetch_timeout = 5000
+all_campaigns_timeout = 5000
+channel_tick_timeout = 5000
 
 ip_rate_limit = { type = 'ip', timeframe = 1200000 }
 sid_rate_limit = { type = 'sid', timeframe = 0 }
 
 creators_whitelist = []
 validators_whitelist = []
-admins = ['0x80690751969B234697e9059e04ed72195c3507fa']
+# Leader - 0xce07CbB7e054514D590a0262C93070D838bFBA2e
+admins = ['0xce07CbB7e054514D590a0262C93070D838bFBA2e']
 
 # Ethereum mainnet tokens
 # [chain."Ganache #1"]

docs/config/prod.toml

@@ -4,12 +4,12 @@ max_channels = 512
 channels_find_limit = 512
 campaigns_find_limit = 512
 spendable_find_limit = 512
-
 wait_time = 40000
 
 msgs_find_limit = 10
-analytics_find_limit_v5 = 5000
-analytics_maxtime_v5 = 15000
+analytics_find_limit = 5000
+# in milliseconds
+analytics_maxtime = 15000
 
 heartbeat_time = 60000
 health_threshold_promilles = 970
@@ -23,13 +23,6 @@ channel_tick_timeout = 10000
 ip_rate_limit = { type = 'ip', timeframe = 1200000 }
 sid_rate_limit = { type = 'sid', timeframe = 0 }
 
-# TODO: Replace with real contract address
-outpace_address = '0x333420fc6a897356e69b62417cd17ff012177d2b'
-# TODO: Replace with real contract address
-sweeper_address = '0x333420fc6a897356e69b62417cd17ff012177d2b'
-
-ethereum_network = 'http://localhost:8545'
-
 creators_whitelist = []
 validators_whitelist = []
 admins = ['0x5d6A3F1AD7b124ecDFDf4841D9bB246eD5fBF04c']

primitives/src/analytics.rs

@@ -7,8 +7,6 @@ use serde::{Deserialize, Serialize};
 
 use self::query::{AllowedKey, Time};
 
-pub const ANALYTICS_QUERY_LIMIT: u32 = 200;
-
 #[cfg(feature = "postgres")]
 pub mod postgres {
     use super::{query::AllowedKey, AnalyticsQuery, OperatingSystem};

primitives/src/config.rs

@@ -46,9 +46,12 @@ pub struct Config {
     pub spendable_find_limit: u32,
     pub wait_time: u32,
     pub msgs_find_limit: u32,
-    pub analytics_find_limit_v5: u32,
+    /// The maximum analytic results you can receive per request.
+    pub analytics_find_limit: u32,
+    /// A timeout to be used when collecting the Analytics for a request.
     /// In milliseconds
-    pub analytics_maxtime_v5: u32,
+    pub analytics_maxtime: u32,
+    /// The amount of time between heartbeats.
     /// In milliseconds
     pub heartbeat_time: u32,
     pub health_threshold_promilles: u32,

sentry/src/routes.rs

@@ -7,7 +7,7 @@
 //!
 //! Paths which include these parameters are validated as follow:
 //!
-//! 
+//!
 //! - `:id` - [`ChannelId`][ChannelId]
 //! - `:addr` - either an [`Address`][Address] or [`ValidatorId`][ValidatorId].
 //!

sentry/src/routes/analytics.rs

@@ -8,7 +8,7 @@ use adapter::client::Locked;
 use hyper::{Body, Request, Response};
 use primitives::analytics::{
     query::{AllowedKey, ALLOWED_KEYS},
-    AnalyticsQuery, AuthenticateAs, ANALYTICS_QUERY_LIMIT,
+    AnalyticsQuery, AuthenticateAs,
 };
 
 /// `GET /v5/analytics` request
@@ -21,7 +21,7 @@ pub async fn analytics<C: Locked + 'static>(
 ) -> Result<Response<Body>, ResponseError> {
     let query = serde_urlencoded::from_str::<AnalyticsQuery>(req.uri().query().unwrap_or(""))?;
 
-    let applied_limit = query.limit.min(ANALYTICS_QUERY_LIMIT);
+    let applied_limit = query.limit.min(app.config.analytics_find_limit);
 
     let route_allowed_keys: HashSet<AllowedKey> =
         request_allowed.unwrap_or_else(|| ALLOWED_KEYS.clone());
@@ -54,14 +54,30 @@ pub async fn analytics<C: Locked + 'static>(
         )));
     }
 
-    let analytics = get_analytics(
-        &app.pool,
-        query.clone(),
-        route_allowed_keys,
-        authenticate_as,
-        applied_limit,
+    let analytics_maxtime = std::time::Duration::from_millis(app.config.analytics_maxtime.into());
+
+    let analytics = match tokio::time::timeout(
+        analytics_maxtime,
+        get_analytics(
+            &app.pool,
+            query.clone(),
+            route_allowed_keys,
+            authenticate_as,
+            applied_limit,
+        ),
     )
-    .await?;
+    .await
+    {
+        Ok(Ok(analytics)) => analytics,
+        // Error getting the analytics
+        Ok(Err(err)) => return Err(err.into()),
+        // Timeout error
+        Err(_elapsed) => {
+            return Err(ResponseError::BadRequest(
+                "Timeout when fetching analytics data".into(),
+            ))
+        }
+    };
 
     Ok(success_response(serde_json::to_string(&analytics)?))
 }