Set a metric field for when GHA 429's

This commit is contained in:
Graham Christensen 2025-01-16 11:13:00 -05:00 committed by Cole Helbling
parent 322a99d45e
commit 4e2b37be36
3 changed files with 44 additions and 12 deletions

View file

@ -48,6 +48,8 @@ const MAX_CONCURRENCY: usize = 4;
type Result<T> = std::result::Result<T, Error>; type Result<T> = std::result::Result<T, Error>;
pub type CircuitBreakerTrippedCallback = Arc<Box<dyn Fn() + Send + Sync>>;
/// An API error. /// An API error.
#[derive(Error, Debug)] #[derive(Error, Debug)]
pub enum Error { pub enum Error {
@ -82,7 +84,6 @@ pub enum Error {
TooManyCollisions, TooManyCollisions,
} }
#[derive(Debug)]
pub struct Api { pub struct Api {
/// Credentials to access the cache. /// Credentials to access the cache.
credentials: Credentials, credentials: Credentials,
@ -104,6 +105,8 @@ pub struct Api {
circuit_breaker_429_tripped: Arc<AtomicBool>, circuit_breaker_429_tripped: Arc<AtomicBool>,
circuit_breaker_429_tripped_callback: CircuitBreakerTrippedCallback,
/// Backend request statistics. /// Backend request statistics.
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
stats: RequestStats, stats: RequestStats,
@ -242,7 +245,10 @@ impl fmt::Display for ApiErrorInfo {
} }
impl Api { impl Api {
pub fn new(credentials: Credentials) -> Result<Self> { pub fn new(
credentials: Credentials,
circuit_breaker_429_tripped_callback: CircuitBreakerTrippedCallback,
) -> Result<Self> {
let mut headers = HeaderMap::new(); let mut headers = HeaderMap::new();
let auth_header = { let auth_header = {
let mut h = HeaderValue::from_str(&format!("Bearer {}", credentials.runtime_token)) let mut h = HeaderValue::from_str(&format!("Bearer {}", credentials.runtime_token))
@ -273,6 +279,7 @@ impl Api {
client, client,
concurrency_limit: Arc::new(Semaphore::new(MAX_CONCURRENCY)), concurrency_limit: Arc::new(Semaphore::new(MAX_CONCURRENCY)),
circuit_breaker_429_tripped: Arc::new(AtomicBool::from(false)), circuit_breaker_429_tripped: Arc::new(AtomicBool::from(false)),
circuit_breaker_429_tripped_callback,
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
stats: Default::default(), stats: Default::default(),
}) })
@ -366,6 +373,8 @@ impl Api {
let client = self.client.clone(); let client = self.client.clone();
let concurrency_limit = self.concurrency_limit.clone(); let concurrency_limit = self.concurrency_limit.clone();
let circuit_breaker_429_tripped = self.circuit_breaker_429_tripped.clone(); let circuit_breaker_429_tripped = self.circuit_breaker_429_tripped.clone();
let circuit_breaker_429_tripped_callback =
self.circuit_breaker_429_tripped_callback.clone();
let url = self.construct_url(&format!("caches/{}", allocation.0 .0)); let url = self.construct_url(&format!("caches/{}", allocation.0 .0));
tokio::task::spawn(async move { tokio::task::spawn(async move {
@ -402,7 +411,8 @@ impl Api {
drop(permit); drop(permit);
circuit_breaker_429_tripped.check_result(&r); circuit_breaker_429_tripped
.check_result(&r, &circuit_breaker_429_tripped_callback);
r r
}) })
@ -465,7 +475,8 @@ impl Api {
.check_json() .check_json()
.await; .await;
self.circuit_breaker_429_tripped.check_result(&res); self.circuit_breaker_429_tripped
.check_result(&res, &self.circuit_breaker_429_tripped_callback);
match res { match res {
Ok(entry) => Ok(Some(entry)), Ok(entry) => Ok(Some(entry)),
@ -508,7 +519,8 @@ impl Api {
.check_json() .check_json()
.await; .await;
self.circuit_breaker_429_tripped.check_result(&res); self.circuit_breaker_429_tripped
.check_result(&res, &self.circuit_breaker_429_tripped_callback);
res res
} }
@ -535,7 +547,8 @@ impl Api {
.check() .check()
.await .await
{ {
self.circuit_breaker_429_tripped.check_err(&e); self.circuit_breaker_429_tripped
.check_err(&e, &self.circuit_breaker_429_tripped_callback);
return Err(e); return Err(e);
} }
@ -610,18 +623,26 @@ async fn handle_error(res: reqwest::Response) -> Error {
} }
trait AtomicCircuitBreaker { trait AtomicCircuitBreaker {
fn check_err(&self, e: &Error); fn check_err(&self, e: &Error, callback: &CircuitBreakerTrippedCallback);
fn check_result<T>(&self, r: &std::result::Result<T, Error>); fn check_result<T>(
&self,
r: &std::result::Result<T, Error>,
callback: &CircuitBreakerTrippedCallback,
);
} }
impl AtomicCircuitBreaker for AtomicBool { impl AtomicCircuitBreaker for AtomicBool {
fn check_result<T>(&self, r: &std::result::Result<T, Error>) { fn check_result<T>(
&self,
r: &std::result::Result<T, Error>,
callback: &CircuitBreakerTrippedCallback,
) {
if let Err(ref e) = r { if let Err(ref e) = r {
self.check_err(e) self.check_err(e, callback)
} }
} }
fn check_err(&self, e: &Error) { fn check_err(&self, e: &Error, callback: &CircuitBreakerTrippedCallback) {
if let Error::ApiError { if let Error::ApiError {
status: reqwest::StatusCode::TOO_MANY_REQUESTS, status: reqwest::StatusCode::TOO_MANY_REQUESTS,
.. ..
@ -636,6 +657,7 @@ impl AtomicCircuitBreaker for AtomicBool {
"; ";
println!("::notice title={title}::{msg}"); println!("::notice title={title}::{msg}");
self.store(true, Ordering::Relaxed); self.store(true, Ordering::Relaxed);
callback();
} }
} }
} }

View file

@ -37,7 +37,15 @@ impl GhaCache {
metrics: Arc<telemetry::TelemetryReport>, metrics: Arc<telemetry::TelemetryReport>,
narinfo_negative_cache: Arc<RwLock<HashSet<String>>>, narinfo_negative_cache: Arc<RwLock<HashSet<String>>>,
) -> Result<GhaCache> { ) -> Result<GhaCache> {
let mut api = Api::new(credentials)?; let cb_metrics = metrics.clone();
let mut api = Api::new(
credentials,
Arc::new(Box::new(move || {
cb_metrics
.tripped_429
.store(true, std::sync::atomic::Ordering::Relaxed);
})),
)?;
if let Some(cache_version) = &cache_version { if let Some(cache_version) = &cache_version {
api.mutate_version(cache_version.as_bytes()); api.mutate_version(cache_version.as_bytes());

View file

@ -28,6 +28,8 @@ pub struct TelemetryReport {
pub num_original_paths: Metric, pub num_original_paths: Metric,
pub num_final_paths: Metric, pub num_final_paths: Metric,
pub num_new_paths: Metric, pub num_new_paths: Metric,
pub tripped_429: std::sync::atomic::AtomicBool,
} }
#[derive(Debug, Default, serde::Serialize)] #[derive(Debug, Default, serde::Serialize)]