From a2083477b9ebc95787cb51fea85ed1afc43f726c Mon Sep 17 00:00:00 2001 From: jrconlin Date: Wed, 20 Nov 2019 11:04:52 -0800 Subject: [PATCH] bug: remove redundant syncstorage metric root Closes #346 --- src/db/mysql/batch.rs | 2 +- src/db/spanner/batch.rs | 4 ++-- src/db/spanner/models.rs | 2 +- src/db/spanner/pool.rs | 2 +- src/web/handlers.rs | 34 +++++++++++++--------------------- 5 files changed, 18 insertions(+), 26 deletions(-) diff --git a/src/db/mysql/batch.rs b/src/db/mysql/batch.rs index 97f263f1..2243bb70 100644 --- a/src/db/mysql/batch.rs +++ b/src/db/mysql/batch.rs @@ -114,7 +114,7 @@ pub fn delete(db: &MysqlDb, params: params::DeleteBatch) -> Result<()> { pub fn commit(db: &MysqlDb, params: params::CommitBatch) -> Result { let bsos = batch_string_to_bsos(¶ms.batch.bsos)?; let mut metrics = db.metrics.clone(); - metrics.start_timer("syncstorage.storage.sql.apply_batch", None); + metrics.start_timer("storage.sql.apply_batch", None); let result = db.post_bsos_sync(params::PostBsos { user_id: params.user_id.clone(), collection: params.collection.clone(), diff --git a/src/db/spanner/batch.rs b/src/db/spanner/batch.rs index cc549ebb..4484a081 100644 --- a/src/db/spanner/batch.rs +++ b/src/db/spanner/batch.rs @@ -73,7 +73,7 @@ pub fn validate(db: &SpannerDb, params: params::ValidateBatch) -> Result { pub fn append(db: &SpannerDb, params: params::AppendToBatch) -> Result<()> { let mut metrics = db.metrics.clone(); - metrics.start_timer("syncstorage.storage.spanner.append_items_to_batch", None); + metrics.start_timer("storage.spanner.append_items_to_batch", None); let exists = validate( db, @@ -150,7 +150,7 @@ pub fn delete(db: &SpannerDb, params: params::DeleteBatch) -> Result<()> { pub fn commit(db: &SpannerDb, params: params::CommitBatch) -> Result { let mut metrics = db.metrics.clone(); - metrics.start_timer("syncstorage.storage.spanner.apply_batch", None); + metrics.start_timer("storage.spanner.apply_batch", None); let collection_id = db.get_collection_id(¶ms.collection)?; // Ensure a parent record exists in user_collections before writing to bsos diff --git a/src/db/spanner/models.rs b/src/db/spanner/models.rs index 565475c4..4029a147 100644 --- a/src/db/spanner/models.rs +++ b/src/db/spanner/models.rs @@ -1175,7 +1175,7 @@ impl SpannerDb { } } if load_size > MAX_SPANNER_LOAD_SIZE { - self.metrics.clone().incr("syncstorage.error.tooMuchData"); + self.metrics.clone().incr("error.tooMuchData"); debug!( "⚠️Attempted to load too much data into Spanner: {:?} bytes", load_size diff --git a/src/db/spanner/pool.rs b/src/db/spanner/pool.rs index 302ff8eb..f329ba2e 100644 --- a/src/db/spanner/pool.rs +++ b/src/db/spanner/pool.rs @@ -65,7 +65,7 @@ impl SpannerDbPool { .max_size(max_size) .thread_pool(Arc::new(ScheduledThreadPool::new(r2d2_thread_pool_size))); let mut metrics = metrics.clone(); - metrics.start_timer("syncstorage.storage.spanner.pool.get", None); + metrics.start_timer("storage.spanner.pool.get", None); #[cfg(any(test, feature = "db_test"))] let builder = if settings.database_use_test_transactions { diff --git a/src/web/handlers.rs b/src/web/handlers.rs index d8874717..ef622c23 100644 --- a/src/web/handlers.rs +++ b/src/web/handlers.rs @@ -17,7 +17,7 @@ use crate::web::{X_LAST_MODIFIED, X_WEAVE_NEXT_OFFSET, X_WEAVE_RECORDS}; pub const ONE_KB: f64 = 1024.0; pub fn get_collections(meta: MetaRequest) -> impl Future { - meta.metrics.incr("syncstorage.request.get_collections"); + meta.metrics.incr("request.get_collections"); meta.db .get_collection_timestamps(meta.user_id) .map_err(From::from) @@ -29,8 +29,7 @@ pub fn get_collections(meta: MetaRequest) -> impl Future impl Future { - meta.metrics - .incr("syncstorage.request.get_collection_counts"); + meta.metrics.incr("request.get_collection_counts"); meta.db .get_collection_counts(meta.user_id) .map_err(From::from) @@ -42,8 +41,7 @@ pub fn get_collection_counts(meta: MetaRequest) -> impl Future impl Future { - meta.metrics - .incr("syncstorage.request.get_collection_usage"); + meta.metrics.incr("request.get_collection_usage"); meta.db .get_collection_usage(meta.user_id) .map_err(From::from) @@ -59,7 +57,7 @@ pub fn get_collection_usage(meta: MetaRequest) -> impl Future impl Future { - meta.metrics.incr("syncstorage.request.get_quota"); + meta.metrics.incr("request.get_quota"); meta.db .get_storage_usage(meta.user_id) .map_err(From::from) @@ -68,7 +66,7 @@ pub fn get_quota(meta: MetaRequest) -> impl Future impl Future { #![allow(clippy::unit_arg)] - meta.metrics.incr("syncstorage.request.delete_all"); + meta.metrics.incr("request.delete_all"); meta.db .delete_storage(meta.user_id) .map_err(From::from) @@ -81,14 +79,14 @@ pub fn delete_collection( let delete_bsos = !coll.query.ids.is_empty(); let metrics = coll.metrics.clone(); let fut = if delete_bsos { - metrics.incr("syncstorage.request.delete_bsos"); + metrics.incr("request.delete_bsos"); coll.db.delete_bsos(params::DeleteBsos { user_id: coll.user_id.clone(), collection: coll.collection.clone(), ids: coll.query.ids.clone(), }) } else { - metrics.incr("syncstorage.request.delete_collection"); + metrics.incr("request.delete_collection"); coll.db.delete_collection(params::DeleteCollection { user_id: coll.user_id.clone(), collection: coll.collection.clone(), @@ -113,9 +111,7 @@ pub fn delete_collection( } pub fn get_collection(coll: CollectionRequest) -> impl Future { - coll.metrics - .clone() - .incr("syncstorage.request.get_collection"); + coll.metrics.clone().incr("request.get_collection"); let params = params::GetBsos { user_id: coll.user_id.clone(), params: coll.query.clone(), @@ -185,9 +181,7 @@ where pub fn post_collection( coll: CollectionPostRequest, ) -> impl Future { - coll.metrics - .clone() - .incr("syncstorage.request.post_collection"); + coll.metrics.clone().incr("request.post_collection"); if coll.batch.is_some() { return Either::A(post_collection_batch(coll)); } @@ -211,9 +205,7 @@ pub fn post_collection( pub fn post_collection_batch( coll: CollectionPostRequest, ) -> impl Future { - coll.metrics - .clone() - .incr("syncstorage.request.post_collection_batch"); + coll.metrics.clone().incr("request.post_collection_batch"); // Bail early if we have nonsensical arguments let breq = match coll.batch.clone() { Some(breq) => breq, @@ -323,7 +315,7 @@ pub fn post_collection_batch( } pub fn delete_bso(bso_req: BsoRequest) -> impl Future { - bso_req.metrics.incr("syncstorage.request.delete_bso"); + bso_req.metrics.incr("request.delete_bso"); bso_req .db .delete_bso(params::DeleteBso { @@ -336,7 +328,7 @@ pub fn delete_bso(bso_req: BsoRequest) -> impl Future impl Future { - bso_req.metrics.incr("syncstorage.request.get_bso"); + bso_req.metrics.incr("request.get_bso"); bso_req .db .get_bso(params::GetBso { @@ -354,7 +346,7 @@ pub fn get_bso(bso_req: BsoRequest) -> impl Future impl Future { - bso_req.metrics.incr("syncstorage.request.put_bso"); + bso_req.metrics.incr("request.put_bso"); bso_req .db .put_bso(params::PutBso {