feat(uptime): add assertion checks to check_executor #437
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sentry[bot]](https://avatars.githubusercontent.com/u/1396951?s=60&v=4){kind=small}
klochek
force-pushed
the
christopherklochek/web_server_checks
branch
from
eabbdae to
3d51390
Compare
Member
There was a problem hiding this comment.
Is all this robots stuff supposed to be in here?
Contributor
Author
There was a problem hiding this comment.
Yeah, it was here before, it just stands out because of the factoring I did (the check code was getting really lengthy and difficult to read; I hope this is an improvement!)
Member
evanpurkhiser
left a comment
evanpurkhiser
left a comment
There was a problem hiding this comment.
Possible to split this up, one PR for adding actual assertion checking, and another for adding it into the endpoint?
klochek
changed the title
Contributor
Author
Okay, endpoint work has been reverted; this is just the execution flow. |
src/assertions/cache.rs
Outdated
Comment on lines
54
to
60
| { | ||
| let rl = self.compiled.read().expect("not poisoned"); | ||
|
|
||
| if let Some(entry) = rl.get(key) { | ||
| return Ok(entry.assertion.clone()); | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
in the block to drop the read lock right?
src/assertions/cache.rs
Outdated
Comment on lines
54
to
60
| { | ||
| let rl = self.compiled.read().expect("not poisoned"); | ||
|
|
||
| if let Some(entry) = rl.get(key) { | ||
| return Ok(entry.assertion.clone()); | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
I wonder if you could avoid the block here if you wrote this as
Suggested change
| { | |
| let rl = self.compiled.read().expect("not poisoned"); | |
| if let Some(entry) = rl.get(key) { | |
| return Ok(entry.assertion.clone()); | |
| } | |
| } | |
| if let Some(entry) = self.compiled.read().expect("not poisoned").get(key) { | |
| return Ok(entry.assertion.clone()); | |
| } |
src/check_executor.rs
Outdated
Comment on lines
379
to
389
| 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, | ||
| }; |
Member
There was a problem hiding this comment.
We probably should put this as a AsStr impl on the CheckStatusReasonType, but not critical.
src/checker/reqwest_checker.rs
Outdated
Comment on lines
275
to
331
| fn to_check_status_and_reason( | ||
| assert_cache: &assertions::cache::Cache, | ||
| response: Result<Response, reqwest::Error>, | ||
| check: &ScheduledCheck, | ||
| body_bytes: &[u8], | ||
| subscription_id: &Uuid, | ||
| ) -> (CheckStatus, Option<CheckStatusReason>) { | ||
| match response { | ||
| Ok(r) => match r.status().is_success() { | ||
| true => { | ||
| if let Some(assertion) = &check.get_config().assertion { | ||
| let comp_assert = assert_cache.get_or_compile(assertion); | ||
|
|
||
| match comp_assert { | ||
| Ok(assertion) => { | ||
| let result = | ||
| assertion.eval(r.status().as_u16(), r.headers(), body_bytes); | ||
|
|
||
| match result { | ||
| Ok(result) => { | ||
| if result { | ||
| (CheckStatus::Success, None) | ||
| } else { | ||
| ( | ||
| CheckStatus::Failure, | ||
| Some(CheckStatusReason { | ||
| status_type: | ||
| CheckStatusReasonType::AssertionFailure, | ||
| description: "Assertion failed".to_string(), | ||
| }), | ||
| ) | ||
| } | ||
| } | ||
| Err(err) => ( | ||
| CheckStatus::Failure, | ||
| Some(CheckStatusReason { | ||
| status_type: CheckStatusReasonType::AssertionError, | ||
| description: err.to_string(), | ||
| }), | ||
| ), | ||
| } | ||
| } | ||
| Err(err) => { | ||
| tracing::warn!( | ||
| "a bad assertion made it to compile from {} : {}", | ||
| subscription_id, | ||
| err.to_string(), | ||
| ); | ||
| ( | ||
| CheckStatus::Failure, | ||
| Some(CheckStatusReason { | ||
| status_type: CheckStatusReasonType::AssertionError, | ||
| description: err.to_string(), | ||
| }), | ||
| ) | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
Would like to see if we could reduce the pyramid of doom effect here
evanpurkhiser
approved these changes
Nov 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.