Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(telemetry): avoid backtrace in TrackingId::from_meta_store error #9059

Merged
merged 1 commit into from
Apr 11, 2023
Merged

refactor(telemetry): avoid backtrace in TrackingId::from_meta_store error #9059

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/meta/src/telemetry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ use crate::storage::{MetaStore, Snapshot};
pub const TELEMETRY_CF: &str = "cf/telemetry";
/// `telemetry` in bytes
pub const TELEMETRY_KEY: &[u8] = &[74, 65, 0x6c, 65, 0x6d, 65, 74, 72, 79];

pub type TelemetryError = String;

pub type Result<T> = core::result::Result<T, TelemetryError>;

#[derive(Clone, Debug)]
pub(crate) struct TrackingId(String);

Expand All @@ -41,11 +46,12 @@ impl TrackingId {
Ok(Self(String::from_utf8(bytes)?))
}

pub(crate) async fn from_meta_store(meta_store: &Arc<impl MetaStore>) -> anyhow::Result<Self> {
pub(crate) async fn from_meta_store(meta_store: &Arc<impl MetaStore>) -> Result<Self> {
match meta_store.get_cf(TELEMETRY_CF, TELEMETRY_KEY).await {
Ok(bytes) => Self::from_bytes(bytes)
.map_err(|e| anyhow::format_err!("failed to parse tracking_id {}", e)),
Err(e) => Err(anyhow::format_err!("tracking_id not exist, {}", e)),
Ok(bytes) => {
Self::from_bytes(bytes).map_err(|e| format!("failed to parse tracking_id {}", e))
}
Err(e) => Err(format!("tracking_id not exist, {}", e)),
}
}

Expand All @@ -57,7 +63,7 @@ impl TrackingId {
/// fetch or create a `tracking_id` from etcd
pub(crate) async fn get_or_create_meta_store(
meta_store: &Arc<impl MetaStore>,
) -> Result<Self, anyhow::Error> {
) -> anyhow::Result<Self, anyhow::Error> {
match Self::from_meta_store(meta_store).await {
Ok(id) => Ok(id),
Err(_) => {
Expand Down Expand Up @@ -139,7 +145,9 @@ impl<S: MetaStore> MetaTelemetryInfoFetcher<S> {
#[async_trait::async_trait]
impl<S: MetaStore> TelemetryInfoFetcher for MetaTelemetryInfoFetcher<S> {
async fn fetch_telemetry_info(&self) -> anyhow::Result<Option<String>> {
let tracking_id = TrackingId::from_meta_store(&self.meta_store).await?;
let tracking_id = TrackingId::from_meta_store(&self.meta_store)
.await
.map_err(|e| anyhow!(e))?;

Ok(Some(tracking_id.into()))
}
Expand Down