chore: Remove async-trait

Cargo.toml

@@ -10,7 +10,6 @@ edition = "2021"
 repository = "https://github.com/stackabletech/trino-lb"
 
 [workspace.dependencies]
-async-trait = "0.1"
 axum = { version = "0.7", features = ["tracing"] }
 axum-server = { version = "0.6", features = ["tls-rustls"] }
 bincode = "1.3"
@@ -51,6 +50,7 @@ tower = "0.4"
 tracing = "0.1"
 tracing-opentelemetry = "0.22"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+trait-variant = "0.1"
 url = { version = "2.5", features = ["serde"] }
 
 # For trino-lb-bench

trino-lb-core/Cargo.toml

@@ -9,7 +9,6 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-async-trait.workspace = true
 chrono.workspace = true
 http-serde.workspace = true
 http.workspace = true

trino-lb-persistence/Cargo.toml

@@ -11,7 +11,6 @@ publish = false
 [dependencies]
 trino-lb-core = { path = "../trino-lb-core" }
 
-async-trait.workspace = true
 bincode.workspace = true
 enum_dispatch.workspace = true
 futures.workspace = true
@@ -24,4 +23,5 @@ snafu.workspace = true
 sqlx.workspace = true
 tokio.workspace = true
 tracing.workspace = true
+trait-variant.workspace = true
 url.workspace = true

trino-lb-persistence/src/in_memory.rs

@@ -5,7 +5,6 @@ use std::{
     time::{Duration, SystemTime, SystemTimeError, UNIX_EPOCH},
 };
 
-use async_trait::async_trait;
 use snafu::{OptionExt, ResultExt, Snafu};
 use tokio::sync::RwLock;
 use tracing::{error, info, instrument};
@@ -54,7 +53,6 @@ impl Default for InMemoryPersistence {
     }
 }
 
-#[async_trait]
 impl Persistence for InMemoryPersistence {
     #[instrument(skip(self))]
     async fn store_queued_query(&self, queued_query: QueuedQuery) -> Result<(), super::Error> {

trino-lb-persistence/src/lib.rs

@@ -1,6 +1,5 @@
 use std::{fmt::Debug, time::SystemTime};
 
-use async_trait::async_trait;
 use enum_dispatch::enum_dispatch;
 use snafu::Snafu;
 use trino_lb_core::{
@@ -29,8 +28,9 @@ pub enum Error {
 /// multiple replicas of trino-lb and every instance can answer requests for every query correctly. This is especially important
 /// for increment and decrement operations to not end up with a wrong query count after multiple trino-lb instances modifying the
 /// counter simultaneous.
-#[async_trait]
 #[enum_dispatch(PersistenceImplementation)]
+// According to https://blog.rust-lang.org/2023/12/21/async-fn-rpit-in-traits.html
+#[trait_variant::make(SendPersistence: Send)]
 pub trait Persistence {
     async fn store_queued_query(&self, query: QueuedQuery) -> Result<(), Error>;
     async fn load_queued_query(&self, query_id: &TrinoLbQueryId) -> Result<QueuedQuery, Error>;

trino-lb-persistence/src/postgres/mod.rs

@@ -3,7 +3,6 @@ use std::{
     time::{SystemTime, UNIX_EPOCH},
 };
 
-use async_trait::async_trait;
 use http::HeaderMap;
 use serde::{Deserialize, Serialize};
 use snafu::{ResultExt, Snafu};
@@ -135,7 +134,6 @@ struct HeaderMapWrapper {
     pub inner: HeaderMap,
 }
 
-#[async_trait]
 impl Persistence for PostgresPersistence {
     #[instrument(skip(self))]
     async fn store_queued_query(&self, queued_query: QueuedQuery) -> Result<(), super::Error> {

trino-lb-persistence/src/redis.rs

@@ -4,7 +4,6 @@ use std::{
     time::{Duration, SystemTime, SystemTimeError, UNIX_EPOCH},
 };
 
-use async_trait::async_trait;
 use futures::{future::try_join_all, TryFutureExt};
 use redis::{
     cluster::ClusterClientBuilder, cluster_async::ClusterConnection, AsyncCommands, RedisError,
@@ -161,7 +160,6 @@ impl RedisPersistence {
     }
 }
 
-#[async_trait]
 impl Persistence for RedisPersistence {
     #[instrument(skip(self))]
     async fn store_queued_query(&self, queued_query: QueuedQuery) -> Result<(), super::Error> {

trino-lb/Cargo.toml

@@ -15,7 +15,6 @@ default-run = "trino-lb"
 trino-lb-core = { path = "../trino-lb-core" }
 trino-lb-persistence = { path = "../trino-lb-persistence" }
 
-async-trait.workspace = true
 axum-server.workspace = true
 axum.workspace = true
 chrono.workspace = true