You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iggy.apache.org by pi...@apache.org on 2025/03/24 20:03:11 UTC
(iggy) branch master updated: fix(server): fix user created at timestamp, update deps (#1662)
This is an automated email from the ASF dual-hosted git repository.
piotr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iggy.git
The following commit(s) were added to refs/heads/master by this push:
new 4af02235 fix(server): fix user created at timestamp, update deps (#1662)
4af02235 is described below
commit 4af02235daabed690c7be183a298f0d28f3f3a05
Author: Piotr Gankiewicz <pi...@gmail.com>
AuthorDate: Mon Mar 24 21:03:06 2025 +0100
fix(server): fix user created at timestamp, update deps (#1662)
Fix the `created_at` field for the user, which should be assigned from the state entry timestamp.
---
Cargo.lock | 119 ++++++++++++++--------------
cli/Cargo.toml | 2 +-
integration/Cargo.toml | 6 +-
server/Cargo.toml | 12 +--
server/src/streaming/partitions/messages.rs | 2 +-
server/src/streaming/systems/users.rs | 1 +
server/src/tcp/tcp_sender.rs | 2 +-
server/src/tcp/tcp_tls_sender.rs | 2 +-
8 files changed, 72 insertions(+), 74 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 4f413be0..6cef1ac5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -729,9 +729,9 @@ dependencies = [
[[package]]
name = "bon"
-version = "3.5.0"
+version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "625e90403736670c971aad50573b7db42e131970d60a14f215b61fdf24e0aa84"
+checksum = "65268237be94042665b92034f979c42d431d2fd998b49809543afe3e66abad1c"
dependencies = [
"bon-macros",
"rustversion",
@@ -739,9 +739,9 @@ dependencies = [
[[package]]
name = "bon-macros"
-version = "3.5.0"
+version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa915c54d505ca9b9b7ac056df7797508c3b817e51609d0ed19949dd0925b872"
+checksum = "803c95b2ecf650eb10b5f87dda6b9f6a1b758cee53245e2b7b825c9b3803a443"
dependencies = [
"darling",
"ident_case",
@@ -896,9 +896,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.2.16"
+version = "1.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
dependencies = [
"jobserver",
"libc",
@@ -1003,9 +1003,9 @@ dependencies = [
[[package]]
name = "clap_complete"
-version = "4.5.46"
+version = "4.5.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98"
+checksum = "c06f5378ea264ad4f82bbc826628b5aad714a75abf6ece087e923010eb937fb6"
dependencies = [
"clap",
]
@@ -1413,9 +1413,9 @@ checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
[[package]]
name = "deranged"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058"
dependencies = [
"powerfmt",
"serde",
@@ -2329,14 +2329,15 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b2fd658b06e56721792c5df4475705b6cda790e9298d19d2f8af083457bcd127"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
+ "log",
"wasm-bindgen",
"windows-core 0.52.0",
]
@@ -2723,9 +2724,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "jiff"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e"
+checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260"
dependencies = [
"jiff-static",
"log",
@@ -2736,9 +2737,9 @@ dependencies = [
[[package]]
name = "jiff-static"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9"
+checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c"
dependencies = [
"proc-macro2",
"quote",
@@ -2930,9 +2931,9 @@ checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
[[package]]
name = "log"
-version = "0.4.26"
+version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
[[package]]
name = "loom"
@@ -3354,9 +3355,9 @@ dependencies = [
[[package]]
name = "opentelemetry"
-version = "0.28.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "236e667b670a5cdf90c258f5a55794ec5ac5027e960c224bff8367a59e1e6426"
+checksum = "768ee97dc5cd695a4dd4a69a0678fb42789666b5a89e8c0af48bb06c6e427120"
dependencies = [
"futures-core",
"futures-sink",
@@ -3368,9 +3369,9 @@ dependencies = [
[[package]]
name = "opentelemetry-appender-tracing"
-version = "0.28.1"
+version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c513c7af3bec30113f3d4620134ff923295f1e9c580fda2b8abe0831f925ddc0"
+checksum = "e716f864eb23007bdd9dc4aec381e188a1cee28eecf22066772b5fd822b9727d"
dependencies = [
"log",
"opentelemetry",
@@ -3381,9 +3382,9 @@ dependencies = [
[[package]]
name = "opentelemetry-http"
-version = "0.28.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8863faf2910030d139fb48715ad5ff2f35029fc5f244f6d5f689ddcf4d26253"
+checksum = "46d7ab32b827b5b495bd90fa95a6cb65ccc293555dcc3199ae2937d2d237c8ed"
dependencies = [
"async-trait",
"bytes",
@@ -3395,11 +3396,10 @@ dependencies = [
[[package]]
name = "opentelemetry-otlp"
-version = "0.28.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bef114c6d41bea83d6dc60eb41720eedd0261a67af57b66dd2b84ac46c01d91"
+checksum = "d899720fe06916ccba71c01d04ecd77312734e2de3467fd30d9d580c8ce85656"
dependencies = [
- "async-trait",
"futures-core",
"http 1.3.1",
"opentelemetry",
@@ -3416,9 +3416,9 @@ dependencies = [
[[package]]
name = "opentelemetry-proto"
-version = "0.28.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f8870d3024727e99212eb3bb1762ec16e255e3e6f58eeb3dc8db1aa226746d"
+checksum = "8c40da242381435e18570d5b9d50aca2a4f4f4d8e146231adb4e7768023309b3"
dependencies = [
"opentelemetry",
"opentelemetry_sdk",
@@ -3428,24 +3428,23 @@ dependencies = [
[[package]]
name = "opentelemetry-semantic-conventions"
-version = "0.28.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fb3a2f78c2d55362cd6c313b8abedfbc0142ab3c2676822068fd2ab7d51f9b7"
+checksum = "84b29a9f89f1a954936d5aa92f19b2feec3c8f3971d3e96206640db7f9706ae3"
[[package]]
name = "opentelemetry_sdk"
-version = "0.28.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84dfad6042089c7fc1f6118b7040dc2eb4ab520abbf410b79dc481032af39570"
+checksum = "afdefb21d1d47394abc1ba6c57363ab141be19e27cc70d0e422b7f303e4d290b"
dependencies = [
- "async-trait",
"futures-channel",
"futures-executor",
"futures-util",
"glob",
"opentelemetry",
"percent-encoding",
- "rand 0.8.5",
+ "rand 0.9.0",
"serde_json",
"thiserror 2.0.12",
"tokio",
@@ -3710,7 +3709,7 @@ version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
dependencies = [
- "zerocopy 0.8.23",
+ "zerocopy 0.8.24",
]
[[package]]
@@ -3988,7 +3987,7 @@ checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
dependencies = [
"rand_chacha 0.9.0",
"rand_core 0.9.3",
- "zerocopy 0.8.23",
+ "zerocopy 0.8.24",
]
[[package]]
@@ -4333,9 +4332,9 @@ dependencies = [
[[package]]
name = "rust_decimal"
-version = "1.37.0"
+version = "1.37.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c24af6e7ac43c88a8a458d1139d0246fdce2f6cd2f1ac6cb51eb88b29c978af"
+checksum = "faa7de2ba56ac291bd90c6b9bece784a52ae1411f9506544b3eae36dd2356d50"
dependencies = [
"arrayvec",
"borsh",
@@ -5063,9 +5062,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "tempfile"
-version = "3.19.0"
+version = "3.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600"
+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
dependencies = [
"fastrand",
"getrandom 0.3.2",
@@ -5165,9 +5164,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.40"
+version = "0.3.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
dependencies = [
"deranged",
"itoa",
@@ -5188,9 +5187,9 @@ checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
[[package]]
name = "time-macros"
-version = "0.2.21"
+version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
dependencies = [
"num-conv",
"time-core",
@@ -5504,9 +5503,9 @@ dependencies = [
[[package]]
name = "tracing-opentelemetry"
-version = "0.29.0"
+version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721f2d2569dce9f3dfbbddee5906941e953bfcdf736a62da3377f5751650cc36"
+checksum = "fd8e764bd6f5813fd8bebc3117875190c5b0415be8f7f8059bffb6ecd979c444"
dependencies = [
"js-sys",
"once_cell",
@@ -5691,7 +5690,7 @@ dependencies = [
"getrandom 0.3.2",
"rand 0.9.0",
"serde",
- "zerocopy 0.8.23",
+ "zerocopy 0.8.24",
]
[[package]]
@@ -6518,11 +6517,11 @@ dependencies = [
[[package]]
name = "zerocopy"
-version = "0.8.23"
+version = "0.8.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
+checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
dependencies = [
- "zerocopy-derive 0.8.23",
+ "zerocopy-derive 0.8.24",
]
[[package]]
@@ -6538,9 +6537,9 @@ dependencies = [
[[package]]
name = "zerocopy-derive"
-version = "0.8.23"
+version = "0.8.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
+checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
dependencies = [
"proc-macro2",
"quote",
@@ -6612,9 +6611,9 @@ dependencies = [
[[package]]
name = "zip"
-version = "2.4.2"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50"
+checksum = "27c03817464f64e23f6f37574b4fdc8cf65925b5bfd2b0f2aedf959791941f88"
dependencies = [
"aes",
"arbitrary",
@@ -6623,7 +6622,6 @@ dependencies = [
"crc32fast",
"crossbeam-utils",
"deflate64",
- "displaydoc",
"flate2",
"getrandom 0.3.2",
"hmac",
@@ -6632,7 +6630,6 @@ dependencies = [
"memchr",
"pbkdf2",
"sha1",
- "thiserror 2.0.12",
"time",
"xz2",
"zeroize",
@@ -6665,18 +6662,18 @@ dependencies = [
[[package]]
name = "zstd-safe"
-version = "7.2.3"
+version = "7.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3051792fbdc2e1e143244dc28c60f73d8470e93f3f9cbd0ead44da5ed802722"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
dependencies = [
"zstd-sys",
]
[[package]]
name = "zstd-sys"
-version = "2.0.14+zstd.1.5.7"
+version = "2.0.15+zstd.1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb060d4926e4ac3a3ad15d864e99ceb5f343c6b34f5bd6d81ae6ed417311be5"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
dependencies = [
"cc",
"pkg-config",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 9e1499f0..08519a29 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -35,7 +35,7 @@ login-session = ["dep:keyring"]
ahash = { version = "0.8.11", features = ["serde"] }
anyhow = "1.0.97"
clap = { version = "4.5.32", features = ["derive"] }
-clap_complete = "4.5.46"
+clap_complete = "4.5.47"
figlet-rs = "0.1.5"
iggy = { path = "../sdk", features = ["iggy-cli"], version = "0.6.210" }
keyring = { version = "3.6.2", features = [
diff --git a/integration/Cargo.toml b/integration/Cargo.toml
index bae380ea..5e339829 100644
--- a/integration/Cargo.toml
+++ b/integration/Cargo.toml
@@ -36,18 +36,18 @@ iggy = { path = "../sdk", features = ["iggy-cli"] }
keyring = "3.6.2"
lazy_static = "1.5.0"
libc = "0.2.171"
-log = "0.4.26"
+log = "0.4.27"
predicates = "3.1.3"
regex = "1.11.1"
serial_test = "3.2.0"
server = { path = "../server" }
-tempfile = "3.19.0"
+tempfile = "3.19.1"
test-case = "3.3.1"
tokio = { version = "1.44.1", features = ["full"] }
tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"] }
twox-hash = { version = "2.1.0", features = ["xxhash32"] }
uuid = { version = "1.16.0", features = ["v7", "fast-rng", "zerocopy"] }
-zip = "2.4.2"
+zip = "2.5.0"
# Some tests are failing in CI due to lack of IPv6 interfaces
# inside the docker containers. This is a temporary workaround (hopefully).
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 205719e3..8e067b6a 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -64,9 +64,9 @@ mimalloc = { version = "0.1", optional = true }
moka = { version = "0.12.10", features = ["future"] }
nix = { version = "0.29", features = ["fs"] }
openssl = { version = "0.10.71", features = ["vendored"] }
-opentelemetry = { version = "0.28.0", features = ["trace", "logs"] }
-opentelemetry-appender-tracing = { version = "0.28.1", features = ["log"] }
-opentelemetry-otlp = { version = "0.28.0", features = [
+opentelemetry = { version = "0.29.0", features = ["trace", "logs"] }
+opentelemetry-appender-tracing = { version = "0.29.1", features = ["log"] }
+opentelemetry-otlp = { version = "0.29.0", features = [
"logs",
"trace",
"grpc-tonic",
@@ -75,8 +75,8 @@ opentelemetry-otlp = { version = "0.28.0", features = [
"reqwest-client",
"tokio",
] }
-opentelemetry-semantic-conventions = { version = "0.28.0" }
-opentelemetry_sdk = { version = "0.28.0", features = [
+opentelemetry-semantic-conventions = { version = "0.29.0" }
+opentelemetry_sdk = { version = "0.29.0", features = [
"rt-tokio",
"logs",
"trace",
@@ -115,7 +115,7 @@ tower-http = { version = "0.6.2", features = [
] }
tracing = { version = "0.1.41" }
tracing-appender = "0.2.3"
-tracing-opentelemetry = { version = "0.29.0" }
+tracing-opentelemetry = { version = "0.30.0" }
tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"] }
twox-hash = { version = "2.1.0", features = ["xxhash32"] }
ulid = "1.2.1"
diff --git a/server/src/streaming/partitions/messages.rs b/server/src/streaming/partitions/messages.rs
index f1ac6ee2..d1427360 100644
--- a/server/src/streaming/partitions/messages.rs
+++ b/server/src/streaming/partitions/messages.rs
@@ -485,7 +485,7 @@ impl Partition {
self.partition_id
);
- // Make sure all of the messages from the accumulator are persisted
+ // Make sure all the messages from the accumulator are persisted
// no leftover from one round trip.
while last_segment.unsaved_messages.is_some() {
last_segment.persist_messages(None).await.unwrap();
diff --git a/server/src/streaming/systems/users.rs b/server/src/streaming/systems/users.rs
index 92370f61..0d11ba34 100644
--- a/server/src/streaming/systems/users.rs
+++ b/server/src/streaming/systems/users.rs
@@ -79,6 +79,7 @@ impl System {
user_state.permissions,
);
+ user.created_at = user_state.created_at;
user.personal_access_tokens = user_state
.personal_access_tokens
.into_values()
diff --git a/server/src/tcp/tcp_sender.rs b/server/src/tcp/tcp_sender.rs
index 2c443966..bf635182 100644
--- a/server/src/tcp/tcp_sender.rs
+++ b/server/src/tcp/tcp_sender.rs
@@ -50,7 +50,7 @@ impl Sender for TcpSender {
.shutdown()
.await
.with_error_context(|error| {
- format!("{COMPONENT} (error: {error}) - failed to shutdown tcp stream")
+ format!("{COMPONENT} (error: {error}) - failed to shutdown TCP stream")
})
.map_err(ServerError::IoError)
}
diff --git a/server/src/tcp/tcp_tls_sender.rs b/server/src/tcp/tcp_tls_sender.rs
index d7d18d73..6768dcca 100644
--- a/server/src/tcp/tcp_tls_sender.rs
+++ b/server/src/tcp/tcp_tls_sender.rs
@@ -52,7 +52,7 @@ impl Sender for TcpTlsSender {
.shutdown()
.await
.with_error_context(|error| {
- format!("{COMPONENT} (error: {error}) - failed to shutdown tcp tls stream")
+ format!("{COMPONENT} (error: {error}) - failed to shutdown TCP TLS stream")
})
.map_err(ServerError::IoError)
}