diff --git a/Cargo.toml b/Cargo.toml index db6ab3ca..4622c855 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,7 +53,7 @@ tracing-opentelemetry = { version = "0.25.0", features = ["metrics"], optional = axum = { workspace = true, features = ["macros"] } axum-extra = { version = "0.9.0", features = ["typed-header", "cookie"], optional = true } tower = { version = "0.5.0", optional = true } -tower-http = { version = "0.5.0", features = ["trace", "timeout", "request-id", "util", "normalize-path", "sensitive-headers", "catch-panic", "compression-full", "decompression-full", "limit", "cors"], optional = true } +tower-http = { version = "0.6.0", features = ["trace", "timeout", "request-id", "util", "normalize-path", "sensitive-headers", "catch-panic", "compression-full", "decompression-full", "limit", "cors"], optional = true } aide = { workspace = true, features = ["axum", "redoc", "scalar", "macros"], optional = true } schemars = { workspace = true, optional = true } http-body-util = "0.1.0" @@ -98,7 +98,7 @@ toml = "0.8.0" url = { version = "2.2.2", features = ["serde"] } uuid = { version = "1.1.2", features = ["v4", "serde"] } futures = "0.3.21" -futures-core = "0.3.28" +futures-core = "0.3.31" chrono = { version = "0.4.34", features = ["serde"] } byte-unit = { version = "5.0.0", features = ["serde"] } convert_case = "0.6.0" @@ -140,16 +140,16 @@ sea-orm-migration = { version = "1.0.0" } clap = { version = "4.3.0", features = ["derive"] } # gRPC -tonic = { version = "0.12.0" } +tonic = { version = "0.12.3" } prost = { version = "0.13.2" } # Sidekiq # Todo: the default `rss-stats` feature has a dependency that currently can't be satisfied (memchr: ~2.3) -rusty-sidekiq = { version = "0.10.5", default-features = false } +rusty-sidekiq = { version = "0.11.0", default-features = false } # Testing insta = { version = "1.39.0", features = ["toml", "filters"] } -rstest = { version = "0.22.0", default-features = false } +rstest = { version = "0.23.0", default-features = false } # Others # Todo: minimize tokio features included in `roadster` diff --git a/examples/app-builder/Cargo.toml b/examples/app-builder/Cargo.toml index 816b278c..73acf772 100644 --- a/examples/app-builder/Cargo.toml +++ b/examples/app-builder/Cargo.toml @@ -34,7 +34,7 @@ sea-orm = { workspace = true, optional = true } clap = { version = "4.3.0", features = ["derive"], optional = true } # The default `rss-stats` feature has a dependency that currently can't be satisfied (memchr: ~2.3) -rusty-sidekiq = { version = "0.10.5", default-features = false } +rusty-sidekiq = { workspace = true, default-features = false } serde = { workspace = true, features = ["derive"] } [build-dependencies] diff --git a/examples/full/Cargo.toml b/examples/full/Cargo.toml index d88d77ad..f11d0cdd 100644 --- a/examples/full/Cargo.toml +++ b/examples/full/Cargo.toml @@ -34,7 +34,7 @@ migration = { path = "migration" } clap = { version = "4.3.0", features = ["derive"] } # The default `rss-stats` feature has a dependency that currently can't be satisfied (memchr: ~2.3) -rusty-sidekiq = { version = "0.10.5", default-features = false } +rusty-sidekiq = { workspace = true, default-features = false } serde = { workspace = true, features = ["derive"] } [build-dependencies] diff --git a/examples/full/build.rs b/examples/full/build.rs index 57d12541..34c5e3a6 100644 --- a/examples/full/build.rs +++ b/examples/full/build.rs @@ -14,7 +14,7 @@ fn main() -> Result<(), Box> { let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap()); tonic_build::configure() .file_descriptor_set_path(out_dir.join("helloworld_descriptor.bin")) - .compile_protos(&["proto/helloworld.proto"], &["proto"]) + .compile(&["proto/helloworld.proto"], &["proto"]) .unwrap(); } diff --git a/src/service/worker/sidekiq/service.rs b/src/service/worker/sidekiq/service.rs index e8aa0f00..57046d3e 100644 --- a/src/service/worker/sidekiq/service.rs +++ b/src/service/worker/sidekiq/service.rs @@ -172,7 +172,7 @@ trait RedisCommands { upper: isize, ) -> Result, RedisError>; - async fn zrem(&mut self, key: String, value: V) -> Result + async fn zrem(&mut self, key: String, value: V) -> Result where V: ToRedisArgs + Send + Sync + 'static; } @@ -188,7 +188,7 @@ impl<'a> RedisCommands for PooledConnection<'a, RedisConnectionManager> { RedisConnection::zrange(self, key, lower, upper).await } - async fn zrem(&mut self, key: String, value: V) -> Result + async fn zrem(&mut self, key: String, value: V) -> Result where V: ToRedisArgs + Send + Sync + 'static, { @@ -280,7 +280,7 @@ mod tests { zrem.never(); } zrem.withf(move |key, jobs| PERIODIC_KEY == key && expected_jobs_removed.iter().eq(jobs)) - .return_once(|_, _: Vec| Ok(true)); + .return_once(|_, _: Vec| Ok(1)); let registered_jobs: HashSet = registered_jobs.iter().map(|s| s.to_string()).collect(); diff --git a/src/tracing/mod.rs b/src/tracing/mod.rs index 3efe98ac..3cd63366 100644 --- a/src/tracing/mod.rs +++ b/src/tracing/mod.rs @@ -8,7 +8,7 @@ use opentelemetry::trace::TracerProvider; #[cfg(feature = "otel")] use opentelemetry_otlp::WithExportConfig; #[cfg(feature = "otel")] -use opentelemetry_sdk::metrics::reader::{DefaultAggregationSelector, DefaultTemporalitySelector}; +use opentelemetry_sdk::metrics::reader::DefaultTemporalitySelector; #[cfg(feature = "otel")] use opentelemetry_sdk::propagation::TraceContextPropagator; #[cfg(feature = "otel")] @@ -140,7 +140,6 @@ pub fn init_tracing( .with_endpoint(otlp_endpoint.clone()), ) .with_resource(otel_resource) - .with_aggregation_selector(DefaultAggregationSelector::new()) .with_temporality_selector(DefaultTemporalitySelector::new()) .build()?; opentelemetry::global::set_meter_provider(provider.clone());