Merge branch 'main' into zp/fix-meta-stack-overflow

risingwavelabs · Feb 7, 2024 · 2bde1a9 · 2bde1a9
2 parents 1b2aa5c + 1a231cd
commit 2bde1a9
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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,