facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity

added: tw_handle to logged scuba samples

Browse Source 
Summary: Added tw_handle to be able to distinguish source of samples

Reviewed By: ikostia

Differential Revision: D13800968

fbshipit-source-id: 6c8528fc69302b2d5c5fbd40ccdf729c9379a101
This commit is contained in:
Pavel Aslanov 2019-01-24 04:01:00 -08:00 committed by Facebook Github Bot
parent 23c154fcd4
commit 8232ba03da
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
blobstore/multiplexedblob/src/base.rs
View File

@ -18,6 +18,7 @@ use failure::{Error, Fail};
use futures::future::{self, Future, Loop};
use futures_ext::{BoxFuture, FutureExt};
use futures_stats::Timed;
use lazy_static::lazy_static;
use scuba::{ScubaClient, ScubaSample};
use time_ext::DurationExt;
use tokio::executor::spawn;
@ -29,6 +30,26 @@ use mononoke_types::BlobstoreBytes;
const SLOW_REQUEST_THRESHOLD: Duration = Duration::from_secs(5);
lazy_static! {
static ref TW_STATS: Vec<(&'static str, String)> = {
let mut stats = Vec::new();
if let (Ok(cluster), Ok(user), Ok(name)) = (
env::var("TW_JOB_CLUSTER"),
env::var("TW_JOB_USER"),
env::var("TW_JOB_NAME"),
) {
stats.push(("tw_handle", format!("{}/{}/{}", cluster, user, name)));
};
if let Ok(smc_tier) = env::var("SMC_TIERS") {
stats.push(("server_tier", smc_tier));
}
if let Ok(tw_task_id) = env::var("TW_TASK_ID") {
stats.push(("tw_task_id", tw_task_id));
}
stats
};
}
#[derive(Fail, Debug, Clone)]
pub enum ErrorKind {
#[fail(display = "Some blobstores failed, and other returned None: {:?}", _0)]
@ -98,11 +119,8 @@ impl Blobstore for MultiplexedBlobstoreBase {
"completion_time",
stats.completion_time.as_micros_unchecked(),
);
if let Ok(smc_tier) = env::var("SMC_TIERS") {
sample.add("server_tier", smc_tier);
}
if let Ok(tw_task_id) = env::var("TW_TASK_ID") {
sample.add("tw_task_id", tw_task_id);
for (key, value) in TW_STATS.iter() {
sample.add(*key, value.clone());
}
// logging session uuid only for slow requests
if stats.completion_time >= SLOW_REQUEST_THRESHOLD {
@ -181,11 +199,8 @@ impl Blobstore for MultiplexedBlobstoreBase {
.add("write_order", write_order.fetch_add(1, Ordering::SeqCst)),
Err(error) => sample.add("error", error.to_string()),
};
if let Ok(smc_tier) = env::var("SMC_TIERS") {
sample.add("server_tier", smc_tier);
}
if let Ok(tw_task_id) = env::var("TW_TASK_ID") {
sample.add("tw_task_id", tw_task_id);
for (key, value) in TW_STATS.iter() {
sample.add(*key, value.clone());
}
// logging session uuid only for slow requests
if stats.completion_time >= SLOW_REQUEST_THRESHOLD {

1
blobstore/multiplexedblob/src/lib.rs
View File

@ -11,6 +11,7 @@ extern crate failure_ext as failure;
extern crate futures;
extern crate futures_ext;
extern crate futures_stats;
extern crate lazy_static;
extern crate scuba;
extern crate time_ext;
extern crate tokio;