Merge pull request #535 from AmbireTech/sentry-uses-axum

Sentry - use axum framework

Author: elpiel

Cargo.lock

@@ -345,7 +345,7 @@ impl Manager {
             .filter(|x| !(self.options.disabled_video && is_video(&x.0.unit)))
             .collect::<Vec<_>>();
 
-        units_with_price.sort_by(|b, a| match (&a.0.price).cmp(&b.0.price) {
+        units_with_price.sort_by(|b, a| match a.0.price.cmp(&b.0.price) {
             Ordering::Equal => randomized_sort_pos(&a.0.unit, seed.clone())
                 .cmp(&randomized_sort_pos(&b.0.unit, seed.clone())),
             ordering => ordering,

adview-manager/src/manager.rs

@@ -13,9 +13,10 @@ services:
       POSTGRES_USER: 'postgres'
       POSTGRES_PASSWORD: 'postgres'
       # harness_* databases are used by the `test_harness` crate for testing
-      # `sentry_leader` is the default database used by `sentry` for running tests
+      # `sentry_leader` is the default database used by `sentry` for running tests and the leader
+      # `sentry_leader` is for running the local follower when maunally testing
       # `primitives` is used for running tests in the `primitives` crate
-      POSTGRES_MULTIPLE_DATABASES: harness_leader,harness_follower,sentry_leader,primitives
+      POSTGRES_MULTIPLE_DATABASES: harness_leader,harness_follower,sentry_leader,sentry_follower,primitives
     networks:
       - adex-external
 

docker-compose.harness.yml

@@ -1,6 +1,5 @@
 use primitives::sentry::ChannelPayRequest;
 use serde_json::json;
-use std::str::FromStr;
 
 fn main() {
     let channel_pay_json = json!({

primitives/examples/channel_pay_request.rs

@@ -103,10 +103,13 @@ pub mod query;
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct AnalyticsQuery {
+    /// Default: `100`
     #[serde(default = "default_limit")]
     pub limit: u32,
+    /// Default: [`EventType::Impression`]
     #[serde(default = "default_event_type")]
     pub event_type: EventType,
+    // Default: [`Metric::Count`]
     #[serde(default = "default_metric")]
     pub metric: Metric,
     pub segment_by: Option<AllowedKey>,
@@ -125,6 +128,28 @@ pub struct AnalyticsQuery {
     pub chains: Vec<ChainId>,
 }
 
+impl Default for AnalyticsQuery {
+    fn default() -> Self {
+        Self {
+            limit: default_limit(),
+            event_type: default_event_type(),
+            metric: default_metric(),
+            segment_by: None,
+            time: Time::default(),
+            campaign_id: None,
+            ad_unit: None,
+            ad_slot: None,
+            ad_slot_type: None,
+            advertiser: None,
+            publisher: None,
+            hostname: None,
+            country: None,
+            os_name: None,
+            chains: Vec::new(),
+        }
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Display, Hash, Eq)]
 #[serde(untagged, into = "String", from = "String")]
 pub enum OperatingSystem {

primitives/src/analytics.rs

@@ -107,6 +107,20 @@ pub struct Time {
     // #[serde(default = "default_timezone_utc")]
     // pub timezone: Tz,//: chrono::TimeZone,
 }
+
+impl Default for Time {
+    fn default() -> Self {
+        let timeframe = Timeframe::Day;
+        let start = DateHour::now() - &timeframe;
+
+        Self {
+            timeframe,
+            start,
+            end: None,
+        }
+    }
+}
+
 mod de {
     use crate::{analytics::Timeframe, sentry::DateHour};
 
@@ -211,6 +225,12 @@ mod test {
             let empty = json!({});
 
             let time = from_value::<Time>(empty).expect("Should use defaults on empty JSON");
+            let default = Time::default();
+            pretty_assertions::assert_eq!(
+                time,
+                default,
+                "Default should generate the same as the default deserialization values!"
+            );
             pretty_assertions::assert_eq!(
                 time,
                 Time {

primitives/src/analytics/query.rs

@@ -24,7 +24,7 @@ pub use event::{Event, EventType, CLICK, IMPRESSION};
 #[serde(rename_all = "camelCase")]
 /// Channel Accounting response
 ///
-/// A collection of all `Accounting`s for a specific [`Channel`](`crate::Channel`)
+/// A collection of all `Accounting`s for a specific [`Channel`](crate::Channel)
 ///
 /// # Examples
 ///
@@ -669,14 +669,14 @@ pub struct AllSpendersQuery {
     pub page: u64,
 }
 
-/// Payouts to be performed for the given [`Channel`](`crate::Channel`).
+/// Payouts to be performed for the given [`Channel`](crate::Channel).
 ///
 /// # Examples
 ///
 /// ```
 #[doc = include_str!("../examples/channel_pay_request.rs")]
 /// ```
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 pub struct ChannelPayRequest {
     pub payouts: UnifiedMap,
 }

primitives/src/sentry.rs

@@ -14,7 +14,7 @@ pub type Map = serde_json::Map<String, serde_json::Value>;
 
 pub mod field;
 
-#[derive(Debug, Clone, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
 #[serde(untagged)]
 pub enum Get<G, V> {
     #[serde(skip_deserializing)]

primitives/src/targeting/input.rs

@@ -58,7 +58,7 @@ where
         self.decorator.with_record(record, values, |decorator| {
             let indent = {
                 let mut history_ref = self.history.borrow_mut();
-                let mut serializer = CompactFormatSerializer::new(decorator, &mut *history_ref);
+                let mut serializer = CompactFormatSerializer::new(decorator, &mut history_ref);
 
                 values.serialize(record, &mut serializer)?;
 

primitives/src/util/logging.rs

@@ -41,10 +41,12 @@ hex = "0.4"
 # CLI
 clap = { version = "3", features = ["cargo"] }
 # Server
+axum = { version = "0.5", features = ["http1", "http2", "headers"] }
+axum-server = { version = "0.4", features = ["tls-rustls"] }
+tower = "0.4"
+tower-http = { version = "0.3", features = ["cors"] }
 tokio = { version = "1", features = ["macros", "time", "rt-multi-thread", "signal"] }
-hyper = { version = "0.14", features = ["stream", "runtime", "http1", "http2", "server"] }
-simple-hyper-server-tls = { version = "0.3", features = ["tls-rustls"] }
-regex = "1"
+
 # Database
 redis = { version = "0.21", features = ["aio", "tokio-comp"] }
 deadpool = "0.9"
@@ -81,3 +83,6 @@ pretty_assertions = "1"
 
 primitives = { path = "../primitives", features = ["postgres", "test-util"] }
 adapter = { version = "0.2", path = "../adapter", features = ["test-util"] }
+
+# we only require `hyper` for `hyper::body::to_bytes` function
+hyper = { version = "0.14", default-features = false }