Use apalis instead of apalis_core in most places

Author: sandhose

Cargo.lock

@@ -55,6 +55,11 @@ mas-templates = { path = "./crates/templates/", version = "=0.9.0" }
 mas-tower = { path = "./crates/tower/", version = "=0.9.0" }
 oauth2-types = { path = "./crates/oauth2-types/", version = "=0.9.0" }
 
+# Async job queue
+[workspace.dependencies.apalis]
+version = "0.4.9"
+features = ["cron"]
+
 # GraphQL server
 [workspace.dependencies.async-graphql]
 version = "6.0.11"

Cargo.toml

@@ -17,7 +17,7 @@ chrono.workspace = true
 thiserror.workspace = true
 futures-util = "0.3.30"
 
-apalis-core = { version = "0.4.9", features = ["tokio-comp"] }
+apalis.workspace = true
 opentelemetry.workspace = true
 rand_core = "0.6.4"
 serde.workspace = true

crates/storage/Cargo.toml

@@ -16,7 +16,7 @@
 
 use std::{num::ParseIntError, ops::Deref};
 
-pub use apalis_core::job::Job;
+pub use apalis::prelude::Job;
 use async_trait::async_trait;
 use opentelemetry::trace::{SpanContext, SpanId, TraceContextExt, TraceFlags, TraceId, TraceState};
 use rand_core::RngCore;
@@ -250,7 +250,7 @@ where
 
 mod jobs {
     // XXX: Move this somewhere else?
-    use apalis_core::job::Job;
+    use apalis::prelude::Job;
     use mas_data_model::{Device, User, UserEmail};
     use serde::{Deserialize, Serialize};
     use ulid::Ulid;

crates/storage/src/job.rs

@@ -13,8 +13,8 @@ workspace = true
 
 [dependencies]
 anyhow.workspace = true
-apalis-core = { version = "0.4.9", features = ["extensions", "tokio-comp", "storage"] }
-apalis-cron = "0.4.9"
+apalis.workspace = true
+apalis-core = "0.4.9"
 async-stream = "0.3.5"
 async-trait.workspace = true
 chrono.workspace = true

crates/tasks/Cargo.toml

@@ -16,15 +16,12 @@
 
 use std::str::FromStr;
 
-use apalis_core::{
-    builder::{WorkerBuilder, WorkerFactoryFn},
-    context::JobContext,
-    executor::TokioExecutor,
-    job::Job,
-    monitor::Monitor,
-    utils::timer::TokioTimer,
+use apalis::{
+    cron::CronStream,
+    prelude::{
+        timer::TokioTimer, Job, JobContext, Monitor, TokioExecutor, WorkerBuilder, WorkerFactoryFn,
+    },
 };
-use apalis_cron::CronStream;
 use chrono::{DateTime, Utc};
 use mas_storage::{oauth2::OAuth2AccessTokenRepository, RepositoryAccess};
 use tracing::{debug, info};
@@ -78,7 +75,7 @@ pub(crate) fn register(
     monitor: Monitor<TokioExecutor>,
     state: &State,
 ) -> Monitor<TokioExecutor> {
-    let schedule = apalis_cron::Schedule::from_str("*/15 * * * * *").unwrap();
+    let schedule = apalis::cron::Schedule::from_str("*/15 * * * * *").unwrap();
     let worker_name = format!("{job}-{suffix}", job = CleanupExpiredTokensJob::NAME);
     let worker = WorkerBuilder::new(worker_name)
         .stream(CronStream::new(schedule).timer(TokioTimer).to_stream())

crates/tasks/src/database.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use anyhow::Context;
-use apalis_core::{context::JobContext, executor::TokioExecutor, monitor::Monitor};
+use apalis::prelude::{JobContext, Monitor, TokioExecutor};
 use chrono::Duration;
 use mas_email::{Address, Mailbox};
 use mas_i18n::locale;

crates/tasks/src/email.rs

@@ -14,7 +14,8 @@
 
 use std::sync::Arc;
 
-use apalis_core::{executor::TokioExecutor, layers::extensions::Extension, monitor::Monitor};
+use apalis::prelude::{Monitor, TokioExecutor};
+use apalis_core::layers::extensions::Extension;
 use mas_email::Mailer;
 use mas_matrix::HomeserverConnection;
 use mas_storage::{BoxClock, BoxRepository, Repository, SystemClock};
@@ -95,7 +96,7 @@ trait JobContextExt {
     fn state(&self) -> State;
 }
 
-impl JobContextExt for apalis_core::context::JobContext {
+impl JobContextExt for apalis::prelude::JobContext {
     fn state(&self) -> State {
         self.data_opt::<State>()
             .expect("state not injected in job context")
@@ -109,21 +110,19 @@ macro_rules! build {
         let storage = $factory.build();
         let worker_name = format!(
             "{job}-{suffix}",
-            job = <$job as ::apalis_core::job::Job>::NAME,
+            job = <$job as ::apalis::prelude::Job>::NAME,
             suffix = $suffix
         );
 
-        let builder = ::apalis_core::builder::WorkerBuilder::new(worker_name)
+        let builder = ::apalis::prelude::WorkerBuilder::new(worker_name)
             .layer($state.inject())
             .layer(crate::utils::trace_layer())
             .layer(crate::utils::metrics_layer());
 
-        let builder = ::apalis_core::storage::builder::WithStorage::with_storage_config(
-            builder,
-            storage,
-            |c| c.fetch_interval(std::time::Duration::from_secs(1)),
-        );
-        ::apalis_core::builder::WorkerFactory::build(builder, ::apalis_core::job_fn::job_fn($fn))
+        let builder = ::apalis::prelude::WithStorage::with_storage_config(builder, storage, |c| {
+            c.fetch_interval(std::time::Duration::from_secs(1))
+        });
+        ::apalis::prelude::WorkerFactory::build(builder, ::apalis::prelude::job_fn($fn))
     }};
 }
 

crates/tasks/src/lib.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use anyhow::Context;
-use apalis_core::{context::JobContext, executor::TokioExecutor, monitor::Monitor};
+use apalis::prelude::{JobContext, Monitor, TokioExecutor};
 use mas_matrix::ProvisionRequest;
 use mas_storage::{
     job::{DeleteDeviceJob, JobWithSpanContext, ProvisionDeviceJob, ProvisionUserJob},

crates/tasks/src/matrix.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use anyhow::Context;
-use apalis_core::{context::JobContext, executor::TokioExecutor, monitor::Monitor};
+use apalis::prelude::{JobContext, Monitor, TokioExecutor};
 use mas_storage::{
     job::{DeactivateUserJob, JobWithSpanContext},
     user::UserRepository,

crates/tasks/src/user.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use apalis_core::{job::Job, request::JobRequest};
+use apalis::{prelude::Job, prelude::JobRequest};
 use mas_storage::job::JobWithSpanContext;
 use mas_tower::{
     make_span_fn, DurationRecorderLayer, FnWrapper, IdentityLayer, InFlightCounterLayer,