mirrors/syncstorage-rs
1
0
Fork 0
mirror of https://github.com/mozilla-services/syncstorage-rs.git synced 2026-05-12 00:03:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #347 from mozilla-services/bug/346

Browse Source 
bug: remove redundant syncstorage metric root
This commit is contained in:
Rachel Tublitz 2019-11-22 16:03:30 -05:00 committed by GitHub
commit 3de7f418e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/mysql/batch.rs
View File

@ -114,7 +114,7 @@ pub fn delete(db: &MysqlDb, params: params::DeleteBatch) -> Result<()> {
pub fn commit(db: &MysqlDb, params: params::CommitBatch) -> Result<results::CommitBatch> {
let bsos = batch_string_to_bsos(&params.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(),

4
src/db/spanner/batch.rs
View File

@ -73,7 +73,7 @@ pub fn validate(db: &SpannerDb, params: params::ValidateBatch) -> Result<bool> {
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<results::CommitBatch> {
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(&params.collection)?;
// Ensure a parent record exists in user_collections before writing to bsos

2
src/db/spanner/models.rs
View File

@ -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

2
src/db/spanner/pool.rs
View File

@ -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 {

34
src/web/handlers.rs
View File

@ -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<Item = HttpResponse, Error = Error> {
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<Item = HttpResponse, Er
}
pub fn get_collection_counts(meta: MetaRequest) -> impl Future<Item = HttpResponse, Error = Error> {
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<Item = HttpRespon
}
pub fn get_collection_usage(meta: MetaRequest) -> impl Future<Item = HttpResponse, Error = Error> {
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<Item = HttpRespons
}
pub fn get_quota(meta: MetaRequest) -> impl Future<Item = HttpResponse, Error = Error> {
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<Item = HttpResponse, Error =
pub fn delete_all(meta: MetaRequest) -> impl Future<Item = HttpResponse, Error = Error> {
#![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<Item = HttpResponse, Error = Error> {
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<Item = HttpResponse, Error = Error> {
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<Item = HttpResponse, Error = Error> {
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<Item = HttpResponse, Error = Error> {
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<Item = HttpResponse, Error
}
pub fn get_bso(bso_req: BsoRequest) -> impl Future<Item = HttpResponse, Error = Error> {
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<Item = HttpResponse, Error =
}
pub fn put_bso(bso_req: BsoPutRequest) -> impl Future<Item = HttpResponse, Error = Error> {
bso_req.metrics.incr("syncstorage.request.put_bso");
bso_req.metrics.incr("request.put_bso");
bso_req
.db
.put_bso(params::PutBso {