feat(uptime): add assertion checks to check_executor; add endpoint check

Author: klochek

Cargo.lock

@@ -65,7 +65,7 @@ iprange = "0.6.7"
 http = "1.2.0"
 relay-pattern = { git = "https://github.com/getsentry/relay", rev = "7ba03b5f6ffe95c2429ba315f661d2b8ee3c0efe" }
 pest = "2.7.15"
-axum = "0.8.6"
+axum = { version = "0.8.6", features = ["macros"] }
 
 [patch.crates-io]
 rdkafka = { git = "https://github.com/fede1024/rust-rdkafka" }
@@ -82,3 +82,5 @@ redis-test-macro = { path = "./redis-test-macro" }
 ntest = "0.9.3"
 socket-server-mocker = "0.5.0"
 httpmock = "0.7.0-rc.1"
+tower = { version = "0.5.2", features = ["util"] }
+http-body-util = "0.1.0"

Cargo.toml

@@ -3,6 +3,7 @@ use jsonpath_rust::{
     parser::{errors::JsonPathError, model::JpQuery, parse_json_path},
     query::js_path_process,
 };
+use serde::Serialize;
 use std::{
     borrow::{Borrow, BorrowMut},
     str::FromStr,
@@ -11,7 +12,7 @@ use std::{
 const GLOB_COMPLEXITY_LIMIT: u64 = 20;
 const ASSERTION_MAX_GAS: u32 = 100;
 
-#[derive(thiserror::Error, Debug)]
+#[derive(thiserror::Error, Debug, Serialize)]
 pub enum Error {
     #[error("Invalid glob: {0}")]
     InvalidGlob(String),

src/assertions/compiled.rs

@@ -5,12 +5,12 @@ use serde::{Deserialize, Serialize};
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub struct Assertion {
-    root: Op,
+    pub(crate) root: Op,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(tag = "cmp", rename_all = "snake_case")]
-enum Comparison {
+pub(crate) enum Comparison {
     LessThan,
     GreaterThan,
     Equal,
@@ -19,20 +19,20 @@ enum Comparison {
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
-struct GlobPattern {
-    value: String,
+pub(crate) struct GlobPattern {
+    pub(crate) value: String,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(tag = "header_op", rename_all = "snake_case")]
-enum HeaderOperand {
+pub(crate) enum HeaderOperand {
     Literal { value: String },
     Glob { pattern: GlobPattern },
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(tag = "header_cmp", rename_all = "snake_case")]
-enum HeaderComparison {
+pub(crate) enum HeaderComparison {
     Always,
     Never,
     Equals { test_value: HeaderOperand },
@@ -43,7 +43,7 @@ enum HeaderComparison {
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(tag = "op", rename_all = "snake_case")]
-enum Op {
+pub(crate) enum Op {
     And {
         children: Vec<Op>,
     },

src/assertions/mod.rs

@@ -38,6 +38,21 @@ pub struct ScheduledCheck {
 }
 
 impl ScheduledCheck {
+    pub fn new(
+        kind: CheckKind,
+        tick: Tick,
+        config: Arc<CheckConfig>,
+        resolve_tx: Sender<Option<CheckResult>>,
+    ) -> ScheduledCheck {
+        ScheduledCheck {
+            kind,
+            tick,
+            config,
+            resolve_tx,
+            retry_count: 0,
+        }
+    }
+
     #[cfg(test)]
     pub fn new_for_test(tick: Tick, config: CheckConfig) -> Self {
         let (resolve_tx, _) = tokio::sync::oneshot::channel();
@@ -284,7 +299,7 @@ async fn executor_loop(
 }
 
 #[allow(clippy::too_many_arguments)]
-async fn do_check(
+pub(crate) async fn do_check(
     failure_retries: u16,
     scheduled_check: ScheduledCheck,
     job_checker: Arc<HttpChecker>,
@@ -367,13 +382,15 @@ fn record_result_metrics(result: &CheckResult, is_retry: bool, will_retry: bool)
         CheckStatus::MissedWindow => "missed_window",
         CheckStatus::DisallowedByRobots => "disallowed_by_robots",
     };
-    let failure_reason = match status_reason.as_ref().map(|r| r.status_type) {
+    let failure_reason = match status_reason.as_ref().map(|r| &r.status_type) {
         Some(CheckStatusReasonType::Failure) => Some("failure"),
         Some(CheckStatusReasonType::DnsError) => Some("dns_error"),
         Some(CheckStatusReasonType::Timeout) => Some("timeout"),
         Some(CheckStatusReasonType::TlsError) => Some("tls_error"),
         Some(CheckStatusReasonType::ConnectionError) => Some("connection_error"),
         Some(CheckStatusReasonType::RedirectError) => Some("redirect_error"),
+        Some(CheckStatusReasonType::AssertionFailure) => Some("assertion_failure"),
+        Some(CheckStatusReasonType::AssertionError) => Some("assertion_error"),
         None => None,
     };
     let status_code = match request_info.as_ref().and_then(|a| a.http_status_code) {