diff --git a/benchmark/Cargo.toml b/benchmark/Cargo.toml index e52d294..f2f1dc8 100644 --- a/benchmark/Cargo.toml +++ b/benchmark/Cargo.toml @@ -15,9 +15,9 @@ anyhow = { version = "1" } env_logger = { version = "0.11" } smol = { version = "2", optional = true } smol-potat = { version = "1", optional = true } -flume = { version = "0.11", default-features = false, features = ["async"] } -clap = { version = "4.5", features = ["derive", "env"] } -tokio = { version = "1.10", features = ["full"], optional = true } +flume = { version = "0.12", default-features = false, features = ["async"] } +clap = { version = "4.6", features = ["derive", "env"] } +tokio = { version = "1.52", features = ["full"], optional = true } [dependencies.sea-streamer] path = ".." # remove this line in your own project diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 6e53c35..37ef4c0 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -15,9 +15,9 @@ anyhow = { version = "1" } env_logger = { version = "0.11" } smol = { version = "2", optional = true } smol-potat = { version = "1", optional = true } -flume = { version = "0.11", default-features = false, features = ["async"] } -clap = { version = "4.5", features = ["derive", "env"] } -tokio = { version = "1.10", features = ["full"], optional = true } +flume = { version = "0.12", default-features = false, features = ["async"] } +clap = { version = "4.6", features = ["derive", "env"] } +tokio = { version = "1.52", features = ["full"], optional = true } [dependencies.sea-streamer] path = ".." # remove this line in your own project diff --git a/sea-streamer-file/Cargo.toml b/sea-streamer-file/Cargo.toml index 011888f..0c050ce 100644 --- a/sea-streamer-file/Cargo.toml +++ b/sea-streamer-file/Cargo.toml @@ -19,16 +19,16 @@ rustdoc-args = ["--cfg", "docsrs"] anyhow = { version = "1", optional = true } env_logger = { version = "0.11", optional = true } fastrand = { version = "2" } -flume = { version = "0.11", default-features = false, features = ["async"] } +flume = { version = "0.12", default-features = false, features = ["async"] } log = { version = "0.4", default-features = false } -notify = { version = "6" } +notify = { version = "8" } sea-streamer-types = { version = "1.0.0-rc", path = "../sea-streamer-types" } sea-streamer-runtime = { version = "1.0.0-rc", path = "../sea-streamer-runtime", features = ["file"]} serde = { version = "1", optional = true, features = ["derive"] } serde_json = { version = "1", optional = true } -clap = { version = "4.5", features = ["derive"], optional = true } +clap = { version = "4.6", features = ["derive"], optional = true } thiserror = { version = "2", default-features = false } -tokio = { version = "1.10.0", optional = true } +tokio = { version = "1.52", optional = true } [dev-dependencies] smol-potat = "1" diff --git a/sea-streamer-iggy/Cargo.toml b/sea-streamer-iggy/Cargo.toml index 13692fe..e0052e1 100644 --- a/sea-streamer-iggy/Cargo.toml +++ b/sea-streamer-iggy/Cargo.toml @@ -18,11 +18,11 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] anyhow = { version = "1", optional = true } env_logger = { version = "0.11", optional = true } -flume = { version = "0.11", default-features = false, features = ["async"] } -iggy = { version = "0.9" } +flume = { version = "0.12", default-features = false, features = ["async"] } +iggy = { version = "0.10" } sea-streamer-types = { version = "1.0.0-rc", path = "../sea-streamer-types", features = ["iggy"] } thiserror = { version = "2", default-features = false } -tokio = { version = "1.10.0", optional = true } +tokio = { version = "1.52", optional = true } tracing = { version = "0.1", default-features = false } [features] diff --git a/sea-streamer-kafka/Cargo.toml b/sea-streamer-kafka/Cargo.toml index 80bbe2b..dbdc9b2 100644 --- a/sea-streamer-kafka/Cargo.toml +++ b/sea-streamer-kafka/Cargo.toml @@ -20,11 +20,11 @@ anyhow = { version = "1", optional = true } env_logger = { version = "0.11", optional = true } smol = { version = "2", optional = true } mac_address = { version = "1" } -rdkafka = { version = "0.37", default-features = false, features = ["libz"] } +rdkafka = { version = "0.39", default-features = false, features = ["libz"] } sea-streamer-types = { version = "1.0.0-rc", path = "../sea-streamer-types" } sea-streamer-runtime = { version = "1.0.0-rc", path = "../sea-streamer-runtime" } -clap = { version = "4.5", features = ["derive", "env"], optional = true } -tokio = { version = "1.10.0", optional = true } +clap = { version = "4.6", features = ["derive", "env"], optional = true } +tokio = { version = "1.52", optional = true } [dev-dependencies] smol-potat = "1" diff --git a/sea-streamer-kafka/src/producer.rs b/sea-streamer-kafka/src/producer.rs index 7f46ae8..bae7806 100644 --- a/sea-streamer-kafka/src/producer.rs +++ b/sea-streamer-kafka/src/producer.rs @@ -387,10 +387,10 @@ impl Future for SendFuture { match self.fut.poll_unpin(cx) { std::task::Poll::Ready(res) => std::task::Poll::Ready(match res { Ok(res) => match res { - Ok((part, offset)) => Ok(MessageHeader::new( + Ok(delivery) => Ok(MessageHeader::new( self.stream_key.take().expect("Must have stream_key"), - ShardId::new(part as u64), - offset as SeqNo, + ShardId::new(delivery.partition as u64), + delivery.offset as SeqNo, Timestamp::now_utc(), )), Err((err, _)) => Err(stream_err(err)), diff --git a/sea-streamer-redis/Cargo.toml b/sea-streamer-redis/Cargo.toml index 4db719d..afbf914 100644 --- a/sea-streamer-redis/Cargo.toml +++ b/sea-streamer-redis/Cargo.toml @@ -18,17 +18,17 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] anyhow = { version = "1", optional = true } env_logger = { version = "0.11", optional = true } -flume = { version = "0.11", default-features = false, features = ["async"] } +flume = { version = "0.12", default-features = false, features = ["async"] } log = { version = "0.4", default-features = false } mac_address = { version = "1" } redis = { version = "1", default-features = false, features = ["acl", "streams"] } sea-streamer-types = { version = "1.0.0-rc", path = "../sea-streamer-types" } sea-streamer-runtime = { version = "1.0.0-rc", path = "../sea-streamer-runtime" } smol = { version = "2", optional = true } -clap = { version = "4.5", features = ["derive", "env"], optional = true } +clap = { version = "4.6", features = ["derive", "env"], optional = true } thiserror = { version = "2", default-features = false } time = { version = "0.3", default-features = false, features = ["std", "parsing"], optional = true } -tokio = { version = "1.10.0", optional = true } +tokio = { version = "1.52", optional = true } [dev-dependencies] smol-potat = "1" diff --git a/sea-streamer-redis/redis-streams-dump/Cargo.toml b/sea-streamer-redis/redis-streams-dump/Cargo.toml index 58a058c..2329d46 100644 --- a/sea-streamer-redis/redis-streams-dump/Cargo.toml +++ b/sea-streamer-redis/redis-streams-dump/Cargo.toml @@ -18,9 +18,9 @@ log = { version = "0.4", default-features = false } sea-streamer-file = { version = "1.0.0-rc", path = "../../sea-streamer-file", features = ["runtime-tokio"] } sea-streamer-redis = { version = "1.0.0-rc", path = "../../sea-streamer-redis", features = ["runtime-tokio"] } sea-streamer-types = { version = "1.0.0-rc", path = "../../sea-streamer-types" } -clap = { version = "4.5", features = ["derive"] } +clap = { version = "4.6", features = ["derive"] } time = { version = "0.3", default-features = false, features = ["std", "parsing"] } -tokio = { version = "1.10.0", features = ["full"]} +tokio = { version = "1.52", features = ["full"]} [dev-dependencies] diff --git a/sea-streamer-runtime/Cargo.toml b/sea-streamer-runtime/Cargo.toml index 1511379..28cdd61 100644 --- a/sea-streamer-runtime/Cargo.toml +++ b/sea-streamer-runtime/Cargo.toml @@ -19,7 +19,7 @@ rustdoc-args = ["--cfg", "docsrs"] async-io = { version = "2.6", optional = true } futures = { version = "0.3", default-features = false } smol = { version = "2.0.2", optional = true } -tokio = { version = "1.10", optional = true, features = ["time", "sync", "rt"] } +tokio = { version = "1.52", optional = true, features = ["time", "sync", "rt"] } [dev-dependencies] diff --git a/sea-streamer-socket/Cargo.toml b/sea-streamer-socket/Cargo.toml index 82da9a1..db91157 100644 --- a/sea-streamer-socket/Cargo.toml +++ b/sea-streamer-socket/Cargo.toml @@ -24,9 +24,9 @@ sea-streamer-redis = { version = "1.0.0-rc", path = "../sea-streamer-redis", opt sea-streamer-stdio = { version = "1.0.0-rc", path = "../sea-streamer-stdio", optional = true } sea-streamer-file = { version = "1.0.0-rc", path = "../sea-streamer-file", optional = true } sea-streamer-types = { version = "1.0.0-rc", path = "../sea-streamer-types" } -clap = { version = "4.5", features = ["derive"], optional = true } +clap = { version = "4.6", features = ["derive"], optional = true } thiserror = { version = "2", default-features = false } -tokio = { version = "1.10.0", optional = true } +tokio = { version = "1.52", optional = true } tracing = { version = "0.1", default-features = false } [features] diff --git a/sea-streamer-stdio/Cargo.toml b/sea-streamer-stdio/Cargo.toml index 01a6146..7467e20 100644 --- a/sea-streamer-stdio/Cargo.toml +++ b/sea-streamer-stdio/Cargo.toml @@ -18,16 +18,16 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] anyhow = { version = "1", optional = true } env_logger = { version = "0.11", optional = true } -flume = { version = "0.11", default-features = false, features = ["async"] } +flume = { version = "0.12", default-features = false, features = ["async"] } log = { version = "0.4", default-features = false } -nom = { version = "7" } +nom = { version = "6" } sea-streamer-types = { version = "1.0.0-rc", path = "../sea-streamer-types" } sea-streamer-runtime = { version = "1.0.0-rc", path = "../sea-streamer-runtime" } serde_json = { version = "1", optional = true } -clap = { version = "4.5", features = ["derive"], optional = true } +clap = { version = "4.6", features = ["derive"], optional = true } thiserror = { version = "2", default-features = false } time = { version = "0.3", default-features = false, features = ["std", "parsing"] } -tokio = { version = "1.10.0", optional = true } +tokio = { version = "1.52", optional = true } [dev-dependencies] diff --git a/sea-streamer-types/Cargo.toml b/sea-streamer-types/Cargo.toml index 1c0f3e8..f95bdcb 100644 --- a/sea-streamer-types/Cargo.toml +++ b/sea-streamer-types/Cargo.toml @@ -19,7 +19,7 @@ rustdoc-args = ["--cfg", "docsrs"] futures = { version = "0.3", default-features = false, features = ["std", "alloc", "async-await"] } thiserror = { version = "2", default-features = false } time = { version = "0.3", default-features = false, features = ["std", "macros", "formatting"] } -url = { version = "2.2", default-features = false } +url = { version = "2.5", default-features = false } serde = { version = "1", default-features = false, optional = true, features = ["derive"] } serde_json = { version = "1", optional = true }