Tree-sitter: Respect verbosity defined in CODEQL_VERBOSITY

github · May 8, 2024 · abc186f · abc186f
1 parent 1433ae4
commit abc186f
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 77 deletions.
diff --git a/ql/Cargo.lock b/ql/Cargo.lock
diff --git a/ql/extractor/src/extractor.rs b/ql/extractor/src/extractor.rs
@@ -20,12 +20,7 @@ pub struct Options {
 }
 
 pub fn run(options: Options) -> std::io::Result<()> {
-    tracing_subscriber::fmt()
-        .with_target(false)
-        .without_time()
-        .with_level(true)
-        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-        .init();
+    codeql_extractor::extractor::set_tracing_level("ql");
 
     let extractor = simple::Extractor {
         prefix: "ql".to_string(),

diff --git a/ql/extractor/src/generator.rs b/ql/extractor/src/generator.rs
@@ -15,12 +15,7 @@ pub struct Options {
 }
 
 pub fn run(options: Options) -> std::io::Result<()> {
-    tracing_subscriber::fmt()
-        .with_target(false)
-        .without_time()
-        .with_level(true)
-        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-        .init();
+    codeql_extractor::extractor::set_tracing_level("ql");
 
     let languages = vec![
         Language {

diff --git a/ruby/extractor/Cargo.lock b/ruby/extractor/Cargo.lock
diff --git a/ruby/extractor/Cargo.toml b/ruby/extractor/Cargo.toml
@@ -34,4 +34,4 @@ lazy_static = "1.4.0"
 # of lock-file update time, but `rules_rust` pins generates a bazel rule that unconditionally downloads `main`, which
 # breaks build hermeticity. So, rev-pinning it is.
 # See also https://github.com/bazelbuild/rules_rust/issues/2502.
-codeql-extractor = { git = "https://github.com/github/codeql.git", rev = "cee6f003fd58c64916c629f7d8b27b870d6f78c5" }
+codeql-extractor = { git = "https://github.com/github/codeql.git", rev = "1433ae458e59fd254215276706262572567cac9b" }
diff --git a/ruby/extractor/cargo-bazel-lock.json b/ruby/extractor/cargo-bazel-lock.json
diff --git a/ruby/extractor/src/extractor.rs b/ruby/extractor/src/extractor.rs
@@ -25,15 +25,7 @@ pub struct Options {
 }
 
 pub fn run(options: Options) -> std::io::Result<()> {
-    tracing_subscriber::fmt()
-        .with_target(false)
-        .without_time()
-        .with_level(true)
-        .with_env_filter(
-            tracing_subscriber::EnvFilter::try_from_default_env()
-                .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new("ruby_extractor=warn")),
-        )
-        .init();
+    extractor::set_tracing_level("ruby");
     let diagnostics = diagnostics::DiagnosticLoggers::new("ruby");
     let mut main_thread_logger = diagnostics.logger();
     let num_threads = match codeql_extractor::options::num_threads() {

diff --git a/ruby/extractor/src/generator.rs b/ruby/extractor/src/generator.rs
@@ -15,12 +15,7 @@ pub struct Options {
 }
 
 pub fn run(options: Options) -> std::io::Result<()> {
-    tracing_subscriber::fmt()
-        .with_target(false)
-        .without_time()
-        .with_level(true)
-        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-        .init();
+    codeql_extractor::extractor::set_tracing_level("ruby");
 
     let languages = vec![
         Language {