Skip to content

Commit

Permalink
chore: Update dependencies (#386)
Browse files Browse the repository at this point in the history
  • Loading branch information
spencewenski authored Oct 5, 2024
1 parent e8ceb3c commit 87bbf0a
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion examples/app-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion examples/full/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion examples/full/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
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();
}

Expand Down
6 changes: 3 additions & 3 deletions src/service/worker/sidekiq/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ trait RedisCommands {
upper: isize,
) -> Result<Vec<String>, RedisError>;

async fn zrem<V>(&mut self, key: String, value: V) -> Result<bool, RedisError>
async fn zrem<V>(&mut self, key: String, value: V) -> Result<usize, RedisError>
where
V: ToRedisArgs + Send + Sync + 'static;
}
Expand All @@ -188,7 +188,7 @@ impl<'a> RedisCommands for PooledConnection<'a, RedisConnectionManager> {
RedisConnection::zrange(self, key, lower, upper).await
}

async fn zrem<V>(&mut self, key: String, value: V) -> Result<bool, RedisError>
async fn zrem<V>(&mut self, key: String, value: V) -> Result<usize, RedisError>
where
V: ToRedisArgs + Send + Sync + 'static,
{
Expand Down Expand Up @@ -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<String>| Ok(true));
.return_once(|_, _: Vec<String>| Ok(1));

let registered_jobs: HashSet<String> =
registered_jobs.iter().map(|s| s.to_string()).collect();
Expand Down
3 changes: 1 addition & 2 deletions src/tracing/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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());
Expand Down

0 comments on commit 87bbf0a

Please sign in to comment.