diff --git a/Cargo.lock b/Cargo.lock index b20c1bd587234..ed7677d652954 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -981,7 +981,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.0.0", + "fastrand 2.0.1", "http 0.2.9", "hyper", "time", @@ -1032,7 +1032,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "fastrand 2.0.0", + "fastrand 2.0.1", "http 0.2.9", "percent-encoding", "tracing", @@ -1057,7 +1057,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "fastrand 2.0.0", + "fastrand 2.0.1", "http 0.2.9", "regex", "tracing", @@ -1260,7 +1260,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "bytes", - "fastrand 2.0.0", + "fastrand 2.0.1", "http 0.2.9", "http-body", "hyper", @@ -1866,7 +1866,7 @@ checksum = "6ffc30dee200c20b4dcb80572226f42658e1d9c4b668656d7cc59c33d50e396e" dependencies = [ "cap-primitives", "cap-std", - "rustix 0.38.28", + "rustix 0.38.31", "smallvec", ] @@ -1882,7 +1882,7 @@ dependencies = [ "io-lifetimes 2.0.3", "ipnet", "maybe-owned", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.48.0", "winx", ] @@ -1906,7 +1906,7 @@ dependencies = [ "cap-primitives", "io-extras", "io-lifetimes 2.0.3", - "rustix 0.38.28", + "rustix 0.38.31", ] [[package]] @@ -1917,7 +1917,7 @@ checksum = "f8f52b3c8f4abfe3252fd0a071f3004aaa3b18936ec97bdbd8763ce03aff6247" dependencies = [ "cap-primitives", "once_cell", - "rustix 0.38.28", + "rustix 0.38.31", "winx", ] @@ -3916,9 +3916,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" @@ -3927,7 +3927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b93f7a0db71c99f68398f80653ed05afb0b00e062e1a20c7ff849c4edfabbbcc" dependencies = [ "cfg-if", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -4291,7 +4291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb" dependencies = [ "io-lifetimes 2.0.3", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -5278,7 +5278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -5557,9 +5557,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libflate" @@ -6061,7 +6061,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.28", + "rustix 0.38.31", ] [[package]] @@ -7751,7 +7751,7 @@ dependencies = [ "hex", "lazy_static", "procfs-core", - "rustix 0.38.28", + "rustix 0.38.31", ] [[package]] @@ -10271,9 +10271,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.0", "errno", @@ -11751,7 +11751,7 @@ dependencies = [ "cap-std", "fd-lock", "io-lifetimes 2.0.3", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.48.0", "winx", ] @@ -11784,14 +11784,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.4.1", - "rustix 0.38.28", + "fastrand 2.0.1", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -12763,7 +12762,7 @@ dependencies = [ "io-extras", "io-lifetimes 2.0.3", "once_cell", - "rustix 0.38.28", + "rustix 0.38.31", "system-interface", "tracing", "wasi-common", @@ -12782,7 +12781,7 @@ dependencies = [ "cap-std", "io-extras", "log", - "rustix 0.38.28", + "rustix 0.38.31", "thiserror", "tracing", "wasmtime", @@ -12957,7 +12956,7 @@ dependencies = [ "bincode 1.3.3", "directories-next", "log", - "rustix 0.38.28", + "rustix 0.38.31", "serde", "serde_derive", "sha2", @@ -13060,7 +13059,7 @@ dependencies = [ "anyhow", "cc", "cfg-if", - "rustix 0.38.28", + "rustix 0.38.31", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", "windows-sys 0.52.0", @@ -13082,7 +13081,7 @@ dependencies = [ "log", "object", "rustc-demangle", - "rustix 0.38.28", + "rustix 0.38.31", "serde", "serde_derive", "target-lexicon", @@ -13101,7 +13100,7 @@ checksum = "dd21fd0f5ca68681d3d5b636eea00f182d0f9d764144469e9257fd7e3f55ae0e" dependencies = [ "object", "once_cell", - "rustix 0.38.28", + "rustix 0.38.31", "wasmtime-versioned-export-macros", ] @@ -13134,7 +13133,7 @@ dependencies = [ "memoffset", "paste", "psm", - "rustix 0.38.28", + "rustix 0.38.31", "sptr", "wasm-encoder", "wasmtime-asm-macros", @@ -13192,7 +13191,7 @@ dependencies = [ "libc", "log", "once_cell", - "rustix 0.38.28", + "rustix 0.38.31", "system-interface", "thiserror", "tokio", @@ -13295,7 +13294,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.28", + "rustix 0.38.31", ] [[package]] @@ -13804,7 +13803,7 @@ dependencies = [ "ring 0.16.20", "rust_decimal", "rustc-hash", - "rustix 0.38.28", + "rustix 0.38.31", "scopeguard", "sea-orm", "sea-query", diff --git a/src/meta/src/telemetry.rs b/src/meta/src/telemetry.rs index 4bf7a2c0ba341..43533f96ae10b 100644 --- a/src/meta/src/telemetry.rs +++ b/src/meta/src/telemetry.rs @@ -18,6 +18,7 @@ use risingwave_common::telemetry::{ current_timestamp, SystemData, TelemetryNodeType, TelemetryReport, TelemetryReportBase, TelemetryResult, }; +use risingwave_common::{GIT_SHA, RW_VERSION}; use risingwave_pb::common::WorkerType; use serde::{Deserialize, Serialize}; use thiserror_ext::AsReport; @@ -33,6 +34,12 @@ struct NodeCount { compactor_count: u64, } +#[derive(Debug, Serialize, Deserialize)] +struct RwVersion { + version: String, + git_sha: String, +} + #[derive(Debug, Serialize, Deserialize)] pub struct MetaTelemetryReport { #[serde(flatten)] @@ -41,6 +48,7 @@ pub struct MetaTelemetryReport { streaming_job_count: u64, // At this point, it will always be etcd, but we will enable telemetry when using memory. meta_backend: MetaBackend, + rw_version: RwVersion, } impl TelemetryReport for MetaTelemetryReport {} @@ -99,6 +107,10 @@ impl TelemetryReportCreator for MetaReportCreator { .map_err(|err| err.as_report().to_string())? as u64; Ok(MetaTelemetryReport { + rw_version: RwVersion { + version: RW_VERSION.to_string(), + git_sha: GIT_SHA.to_string(), + }, base: TelemetryReportBase { tracking_id, session_id,