Mikayla MakiandConrad Irwin
80c14c9198
TODO: - [x] Finish GPUI changes on other operating systems This is a largely internal change to how we report data to our diagnostics and telemetry. This PR also includes an update to our blade backend which allows us to report errors in a more useful way when failing to initialize blade. Release Notes: - N/A --------- Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
76 lines
2.4 KiB
Rust
76 lines
2.4 KiB
Rust
use client::telemetry;
|
|
use gpui::{AppContext, Task};
|
|
use human_bytes::human_bytes;
|
|
use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
|
|
use serde::Serialize;
|
|
use std::{env, fmt::Display};
|
|
use sysinfo::{MemoryRefreshKind, RefreshKind, System};
|
|
|
|
#[derive(Clone, Debug, Serialize)]
|
|
pub struct SystemSpecs {
|
|
app_version: String,
|
|
release_channel: &'static str,
|
|
os_name: String,
|
|
os_version: String,
|
|
memory: u64,
|
|
architecture: &'static str,
|
|
commit_sha: Option<String>,
|
|
}
|
|
|
|
impl SystemSpecs {
|
|
pub fn new(cx: &AppContext) -> Task<Self> {
|
|
let app_version = AppVersion::global(cx).to_string();
|
|
let release_channel = ReleaseChannel::global(cx);
|
|
let os_name = telemetry::os_name();
|
|
let system = System::new_with_specifics(
|
|
RefreshKind::new().with_memory(MemoryRefreshKind::everything()),
|
|
);
|
|
let memory = system.total_memory();
|
|
let architecture = env::consts::ARCH;
|
|
let commit_sha = match release_channel {
|
|
ReleaseChannel::Dev | ReleaseChannel::Nightly => {
|
|
AppCommitSha::try_global(cx).map(|sha| sha.0.clone())
|
|
}
|
|
_ => None,
|
|
};
|
|
|
|
cx.background_executor().spawn(async move {
|
|
let os_version = telemetry::os_version();
|
|
SystemSpecs {
|
|
app_version,
|
|
release_channel: release_channel.display_name(),
|
|
os_name,
|
|
os_version,
|
|
memory,
|
|
architecture,
|
|
commit_sha,
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
impl Display for SystemSpecs {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
let os_information = format!("OS: {} {}", self.os_name, self.os_version);
|
|
let app_version_information = format!(
|
|
"Zed: v{} ({})",
|
|
self.app_version,
|
|
match &self.commit_sha {
|
|
Some(commit_sha) => format!("{} {}", self.release_channel, commit_sha),
|
|
None => self.release_channel.to_string(),
|
|
}
|
|
);
|
|
let system_specs = [
|
|
app_version_information,
|
|
os_information,
|
|
format!("Memory: {}", human_bytes(self.memory as f64)),
|
|
format!("Architecture: {}", self.architecture),
|
|
]
|
|
.into_iter()
|
|
.collect::<Vec<String>>()
|
|
.join("\n");
|
|
|
|
write!(f, "{system_specs}")
|
|
}
|
|
}
|