From 683a7d56542c121525a70f043b1bb4cc963ab530 Mon Sep 17 00:00:00 2001 From: David Richey Date: Wed, 29 Jan 2025 16:03:18 -0800 Subject: [PATCH] rust-project: Don't log to scuba in CI Summary: The vast majority of rust-project telemetry is coming from CI. We don't need that. Reviewed By: Wilfred Differential Revision: D68861251 fbshipit-source-id: 0de1f60eee8d5ed4d0da44345f19facfe47b8579 --- integrations/rust-project/src/scuba.rs | 61 ++++++++++++++++---------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/integrations/rust-project/src/scuba.rs b/integrations/rust-project/src/scuba.rs index 7dd84cfa5661f..e3d9b34cf01fe 100644 --- a/integrations/rust-project/src/scuba.rs +++ b/integrations/rust-project/src/scuba.rs @@ -14,13 +14,15 @@ use crate::cli::Input; #[cfg(fbcode_build)] pub(crate) fn log_develop(duration: Duration, input: Input, invoked_by_ra: bool) { - let mut sample = new_sample("develop"); - sample.add("duration_ms", duration.as_millis() as i64); - sample.add("input", format!("{:?}", input)); - sample.add("revision", get_sl_revision()); - sample.add("invoked_by_ra", invoked_by_ra); - sample.log(); - sample.flush(Duration::from_millis(500)); + if !is_ci() { + let mut sample = new_sample("develop"); + sample.add("duration_ms", duration.as_millis() as i64); + sample.add("input", format!("{:?}", input)); + sample.add("revision", get_sl_revision()); + sample.add("invoked_by_ra", invoked_by_ra); + sample.log(); + sample.flush(Duration::from_millis(500)); + } } #[cfg(not(fbcode_build))] @@ -28,13 +30,15 @@ pub(crate) fn log_develop(_duration: Duration, _input: Input, _invoked_by_ra: bo #[cfg(fbcode_build)] pub(crate) fn log_develop_error(error: &anyhow::Error, input: Input, invoked_by_ra: bool) { - let mut sample = new_sample("develop"); - sample.add("error", format!("{:#?}", error)); - sample.add("input", format!("{:?}", input)); - sample.add("revision", get_sl_revision()); - sample.add("invoked_by_ra", invoked_by_ra); - sample.log(); - sample.flush(Duration::from_millis(500)); + if !is_ci() { + let mut sample = new_sample("develop"); + sample.add("error", format!("{:#?}", error)); + sample.add("input", format!("{:?}", input)); + sample.add("revision", get_sl_revision()); + sample.add("invoked_by_ra", invoked_by_ra); + sample.log(); + sample.flush(Duration::from_millis(500)); + } } #[cfg(not(fbcode_build))] @@ -52,11 +56,13 @@ fn get_sl_revision() -> String { #[cfg(fbcode_build)] pub(crate) fn log_check(duration: Duration, saved_file: &Path, use_clippy: bool) { - let mut sample = new_sample("check"); - sample.add("duration_ms", duration.as_millis() as i64); - sample.add("saved_file", saved_file.display().to_string()); - sample.add("use_clippy", use_clippy.to_string()); - sample.log(); + if !is_ci() { + let mut sample = new_sample("check"); + sample.add("duration_ms", duration.as_millis() as i64); + sample.add("saved_file", saved_file.display().to_string()); + sample.add("use_clippy", use_clippy.to_string()); + sample.log(); + } } #[cfg(not(fbcode_build))] @@ -64,11 +70,13 @@ pub(crate) fn log_check(_duration: Duration, _saved_file: &Path, _use_clippy: bo #[cfg(fbcode_build)] pub(crate) fn log_check_error(error: &anyhow::Error, saved_file: &Path, use_clippy: bool) { - let mut sample = new_sample("check"); - sample.add("error", format!("{:#?}", error)); - sample.add("saved_file", saved_file.display().to_string()); - sample.add("use_clippy", use_clippy.to_string()); - sample.log(); + if !is_ci() { + let mut sample = new_sample("check"); + sample.add("error", format!("{:#?}", error)); + sample.add("saved_file", saved_file.display().to_string()); + sample.add("use_clippy", use_clippy.to_string()); + sample.log(); + } } #[cfg(not(fbcode_build))] @@ -95,3 +103,8 @@ fn new_sample(kind: &str) -> scuba::ScubaSampleBuilder { } sample } + +#[cfg(fbcode_build)] +fn is_ci() -> bool { + std::env::var("SANDCASTLE").is_ok() +}