diff --git a/crates/schema/database/mysql_queries/src/queries/user_daily_spends/aggregate_daily_spends_for_date.rs b/crates/schema/database/mysql_queries/src/queries/user_daily_spends/aggregate_daily_spends_for_date.rs index 74981bd4f3..ada545d627 100644 --- a/crates/schema/database/mysql_queries/src/queries/user_daily_spends/aggregate_daily_spends_for_date.rs +++ b/crates/schema/database/mysql_queries/src/queries/user_daily_spends/aggregate_daily_spends_for_date.rs @@ -60,6 +60,7 @@ SELECT CAST(COALESCE(SUM(maybe_credits_granted), 0) AS UNSIGNED) AS `credits_granted!: u64` FROM user_spend_events WHERE maybe_user_token IS NOT NULL + AND is_production = TRUE AND payment_occurred_at >= ? AND payment_occurred_at < ? GROUP BY maybe_user_token, payments_namespace diff --git a/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_payments_namespaces_with_spend_activity.rs b/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_payments_namespaces_with_spend_activity.rs index 82afd842c6..6b21596631 100644 --- a/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_payments_namespaces_with_spend_activity.rs +++ b/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_payments_namespaces_with_spend_activity.rs @@ -24,6 +24,7 @@ where SELECT DISTINCT payments_namespace AS `payments_namespace!: PaymentsNamespace` FROM user_spend_events WHERE maybe_user_token IS NOT NULL + AND is_production = TRUE "#, ) .fetch_all(args.mysql_executor) diff --git a/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_user_spend_events_for_user.rs b/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_user_spend_events_for_user.rs index 3d52335f00..0544fc53e2 100644 --- a/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_user_spend_events_for_user.rs +++ b/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_user_spend_events_for_user.rs @@ -42,6 +42,7 @@ SELECT FROM user_spend_events WHERE maybe_user_token = ? AND payments_namespace = ? + AND is_production = TRUE ORDER BY payment_occurred_at ASC "#, args.user_token.as_str(), diff --git a/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_user_tokens_with_spend_activity.rs b/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_user_tokens_with_spend_activity.rs index a3910760b1..11018aa2f8 100644 --- a/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_user_tokens_with_spend_activity.rs +++ b/crates/schema/database/mysql_queries/src/queries/user_spend_summaries/list_user_tokens_with_spend_activity.rs @@ -29,6 +29,7 @@ where SELECT DISTINCT maybe_user_token AS `user_token!: UserToken` FROM user_spend_events WHERE maybe_user_token IS NOT NULL + AND is_production = TRUE AND payments_namespace = ? AND maybe_user_token > ? ORDER BY maybe_user_token diff --git a/crates/service/job/user_spend_analytics_job/src/main.rs b/crates/service/job/user_spend_analytics_job/src/main.rs index bec1e56d11..aeeaa3fa42 100644 --- a/crates/service/job/user_spend_analytics_job/src/main.rs +++ b/crates/service/job/user_spend_analytics_job/src/main.rs @@ -24,6 +24,7 @@ use jobs_common::job_stats::JobStats; use server_environment::ServerEnvironment; use shared_env_var_config::logging::DEFAULT_RUST_LOG; use shared_env_var_config::mysql::env_get_mysql_connection_string_or_default; +use tokio::signal::unix::{signal, SignalKind}; use crate::http_server::run_http_server::{launch_http_server, CreateServerArgs}; use crate::job::main_loop::main_loop; @@ -147,18 +148,29 @@ async fn main() -> AnyhowResult<()> { warn!("HTTP server thread is shut down."); }); - // Listen for SIGTERM / Ctrl-C to trigger graceful shutdown. + // Listen for SIGTERM (k8s pod termination) and SIGINT (Ctrl-C) to trigger + // graceful shutdown of the main loop. let application_shutdown_for_signal = application_shutdown.clone(); tokio::spawn(async move { - match tokio::signal::ctrl_c().await { - Ok(()) => { - info!("Received shutdown signal. Shutting down..."); - application_shutdown_for_signal.set(true); - } + let mut sigterm = match signal(SignalKind::terminate()) { + Ok(stream) => stream, Err(err) => { - warn!("Error listening for shutdown signal: {:?}", err); + warn!("Failed to install SIGTERM handler: {:?}", err); + return; } + }; + let mut sigint = match signal(SignalKind::interrupt()) { + Ok(stream) => stream, + Err(err) => { + warn!("Failed to install SIGINT handler: {:?}", err); + return; + } + }; + tokio::select! { + _ = sigterm.recv() => info!("Received SIGTERM. Shutting down..."), + _ = sigint.recv() => info!("Received SIGINT. Shutting down..."), } + application_shutdown_for_signal.set(true); }); main_loop(job_dependencies).await;