feat: Remove configuration via yaml (#10)

* feat: Remove yaml configuration

* update LICENSE-3rdparty.csv

* simplify test module paths

Author: timfish

Cargo.lock

@@ -9,17 +9,15 @@ license = "Apache-2.0"
 # crate-type = ["cdylib"]
 # This was originally set as above, but commented to run tests in tests folder.
 
-
 [profile.release]
 lto = true
 
 [dependencies]
-nodejs-semver = "4.1.0"
-swc = "16.1.0"
-swc_core = { version = "16.2.3", features = ["ecma_plugin_transform","ecma_quote"] }
-swc_ecma_parser = "10.0.0"
-swc_ecma_visit = { version = "8.0.0", features = ["path"] }
-yaml-rust2 = "0.10.0"
+nodejs-semver = "4"
+swc = "21"
+swc_core = { version = "22", features = ["ecma_plugin_transform","ecma_quote"] }
+swc_ecma_parser = "11"
+swc_ecma_visit = { version = "8", features = ["path"] }
 
 [dev-dependencies]
-assert_cmd = "2.0.16"
+assert_cmd = "2"

Cargo.toml

@@ -7,11 +7,10 @@ android-tzdata,https://github.com/RumovZ/android-tzdata,MIT OR Apache-2.0,RumovZ
 android_system_properties,https://github.com/nical/android_system_properties,MIT OR Apache-2.0,Nicolas Silva <[email protected]>
 ansi_term,https://github.com/ogham/rust-ansi-term,MIT,"[email protected], Ryan Scheel (Havvy) <[email protected]>, Josh Triplett <[email protected]>"
 anyhow,https://github.com/dtolnay/anyhow,MIT OR Apache-2.0,David Tolnay <[email protected]>
-arraydeque,https://github.com/andylokandy/arraydeque,MIT OR Apache-2.0,andylokandy
 arrayvec,https://github.com/bluss/arrayvec,MIT OR Apache-2.0,bluss
 ascii,https://github.com/tomprogrammer/rust-ascii,Apache-2.0 OR MIT,"Thomas Bahn <[email protected]>, Torbjørn Birch Moltu <[email protected]>, Simon Sapin <[email protected]>"
 auto_impl,https://github.com/auto-impl-rs/auto_impl,MIT OR Apache-2.0,"Ashley Mannix <[email protected]>, Lukas Kalbertodt <[email protected]>"
-base64,https://github.com/marshallpierce/rust-base64,MIT OR Apache-2.0,"Alice Maz <[email protected]>, Marshall Pierce <[email protected]>"
+base64,https://github.com/marshallpierce/rust-base64,MIT OR Apache-2.0,Marshall Pierce <[email protected]>
 base64-simd,https://github.com/Nugine/simd,MIT,The base64-simd Authors
 bitflags,https://github.com/bitflags/bitflags,MIT OR Apache-2.0,The Rust Project Developers
 bitvec,https://github.com/bitvecto-rs/bitvec,MIT,The bitvec Authors
@@ -39,18 +38,15 @@ difference,https://github.com/johannhof/difference.rs,MIT,Johann Hofmann <mail@j
 digest,https://github.com/RustCrypto/traits,MIT OR Apache-2.0,RustCrypto Developers
 displaydoc,https://github.com/yaahc/displaydoc,MIT OR Apache-2.0,Jane Lusby <[email protected]>
 either,https://github.com/rayon-rs/either,MIT OR Apache-2.0,bluss
-encoding_rs,https://github.com/hsivonen/encoding_rs,(Apache-2.0 OR MIT) AND BSD-3-Clause,Henri Sivonen <[email protected]>
 equivalent,https://github.com/indexmap-rs/equivalent,Apache-2.0 OR MIT,The equivalent Authors
-errno,https://github.com/lambda-fairy/rust-errno,MIT OR Apache-2.0,Chris Wong <[email protected]>
+errno,https://github.com/lambda-fairy/rust-errno,MIT OR Apache-2.0,"Chris Wong <[email protected]>, Dan Gohman <[email protected]>"
 fastrand,https://github.com/smol-rs/fastrand,Apache-2.0 OR MIT,Stjepan Glavina <[email protected]>
 fixedbitset,https://github.com/petgraph/fixedbitset,MIT OR Apache-2.0,bluss
-foldhash,https://github.com/orlp/foldhash,Zlib,Orson Peters <[email protected]>
 funty,https://github.com/myrrlyn/funty,MIT,myrrlyn <[email protected]>
 generic-array,https://github.com/fizyk20/generic-array,MIT,"Bartłomiej Kamiński <[email protected]>, Aaron Trent <[email protected]>"
 getrandom,https://github.com/rust-random/getrandom,MIT OR Apache-2.0,The Rand Project Developers
 glob,https://github.com/rust-lang/glob,MIT OR Apache-2.0,The Rust Project Developers
 hashbrown,https://github.com/rust-lang/hashbrown,MIT OR Apache-2.0,Amanieu d'Antras <[email protected]>
-hashlink,https://github.com/kyren/hashlink,MIT OR Apache-2.0,kyren <[email protected]>
 heck,https://github.com/withoutboats/heck,MIT OR Apache-2.0,The heck Authors
 hermit-abi,https://github.com/hermit-os/hermit-rs,MIT OR Apache-2.0,Stefan Lankes
 hex,https://github.com/KokaKiwi/rust-hex,MIT OR Apache-2.0,KokaKiwi <[email protected]>
@@ -98,6 +94,8 @@ once_cell,https://github.com/matklad/once_cell,MIT OR Apache-2.0,Aleksey Kladov
 outref,https://github.com/Nugine/outref,MIT,The outref Authors
 overload,https://github.com/danaugrs/overload,MIT,Daniel Salvadori <[email protected]>
 owo-colors,https://github.com/owo-colors/owo-colors,MIT,jam1garner <[email protected]>
+par-core,https://github.com/dudykr/ddbase,Apache-2.0,강동윤 <[email protected]>
+par-iter,https://github.com/dudykr/ddbase,Apache-2.0,The par-iter Authors
 parking_lot,https://github.com/Amanieu/parking_lot,MIT OR Apache-2.0,Amanieu d'Antras <[email protected]>
 path-clean,https://github.com/danreeves/path-clean,MIT OR Apache-2.0,Dan Reeves <[email protected]>
 pathdiff,https://github.com/Manishearth/pathdiff,MIT OR Apache-2.0,Manish Goregaokar <[email protected]>
@@ -109,6 +107,7 @@ proc-macro2,https://github.com/dtolnay/proc-macro2,MIT OR Apache-2.0,"David Toln
 psm,https://github.com/rust-lang/stacker,MIT OR Apache-2.0,Simonas Kazlauskas <[email protected]>
 ptr_meta,https://github.com/rkyv/ptr_meta,MIT,David Koloski <[email protected]>
 quote,https://github.com/dtolnay/quote,MIT OR Apache-2.0,David Tolnay <[email protected]>
+r-efi,https://github.com/r-efi/r-efi,MIT OR Apache-2.0 OR LGPL-2.1-or-later,The r-efi Authors
 radium,https://github.com/bitvecto-rs/radium,MIT,"Nika Layzell <[email protected]>, myrrlyn <[email protected]>"
 radix_fmt,https://gitlab.com/Boiethios/radix_fmt_rs,Apache-2.0,Félix <[email protected]>
 rancor,https://github.com/rkyv/rancor,MIT,David Koloski <[email protected]>
@@ -192,7 +191,11 @@ wasm-bindgen-shared,https://github.com/rustwasm/wasm-bindgen/tree/master/crates/
 winapi,https://github.com/retep998/winapi-rs,MIT OR Apache-2.0,Peter Atashian <[email protected]>
 winapi-util,https://github.com/BurntSushi/winapi-util,Unlicense OR MIT,Andrew Gallant <[email protected]>
 windows-core,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
+windows-implement,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
+windows-interface,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
 windows-link,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
+windows-result,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
+windows-strings,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
 windows-sys,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
 windows-targets,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
 windows_aarch64_gnullvm,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
@@ -204,11 +207,10 @@ windows_x86_64_gnu,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Mic
 windows_x86_64_gnullvm,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
 windows_x86_64_msvc,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
 winnow,https://github.com/winnow-rs/winnow,MIT,The winnow Authors
-wit-bindgen-rt,https://github.com/bytecodealliance/wasi-rs,Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT,The wit-bindgen-rt Authors
+wit-bindgen-rt,https://github.com/bytecodealliance/wit-bindgen,Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT,The wit-bindgen-rt Authors
 write16,https://github.com/hsivonen/write16,Apache-2.0 OR MIT,The write16 Authors
 writeable,https://github.com/unicode-org/icu4x,Unicode-3.0,The ICU4X Project Developers
 wyz,https://github.com/myrrlyn/wyz,MIT,myrrlyn <[email protected]>
-yaml-rust2,https://github.com/Ethiraric/yaml-rust2,MIT OR Apache-2.0,"Yuheng Chen <[email protected]>, Ethiraric <[email protected]>, David Aguilar <[email protected]>"
 yansi,https://github.com/SergioBenitez/yansi,MIT OR Apache-2.0,Sergio Benitez <[email protected]>
 yoke,https://github.com/unicode-org/icu4x,Unicode-3.0,Manish Goregaokar <[email protected]>
 yoke-derive,https://github.com/unicode-org/icu4x,Unicode-3.0,Manish Goregaokar <[email protected]>

LICENSE-3rdparty.csv

@@ -2,30 +2,9 @@
  * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
  * This product includes software developed at Datadog (<https://www.datadoghq.com>/). Copyright 2025 Datadog, Inc.
  **/
-use std::path::PathBuf;
-
-use nodejs_semver::{Range, Version};
-
-use crate::error::OrchestrionError;
 use crate::function_query::FunctionQuery;
-
-use yaml_rust2::{Yaml, YamlLoader};
-
-macro_rules! get_str {
-    ($property:expr, $name:expr) => {
-        $property[$name]
-            .as_str()
-            .ok_or(format!("Invalid config: '{}' must be a string", $name))?
-    };
-}
-
-macro_rules! get_arr {
-    ($property:expr, $name:expr) => {
-        $property[$name]
-            .as_vec()
-            .ok_or(format!("Invalid config: '{}' must be a array", $name))?
-    };
-}
+use nodejs_semver::{Range, Version};
+use std::path::PathBuf;
 
 #[derive(Clone, Debug)]
 pub enum InstrumentationOperator {
@@ -36,6 +15,7 @@ pub enum InstrumentationOperator {
 }
 
 impl InstrumentationOperator {
+    #[must_use]
     pub fn as_str(&self) -> &'static str {
         match self {
             InstrumentationOperator::Callback => "traceCallback",
@@ -44,19 +24,9 @@ impl InstrumentationOperator {
             InstrumentationOperator::Async => "traceAsync",
         }
     }
-
-    pub fn from_str(s: &str) -> Option<InstrumentationOperator> {
-        match s {
-            "traceCallback" => Some(InstrumentationOperator::Callback),
-            "tracePromise" => Some(InstrumentationOperator::Promise),
-            "traceSync" => Some(InstrumentationOperator::Sync),
-            "traceAsync" => Some(InstrumentationOperator::Async),
-            _ => None,
-        }
-    }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct InstrumentationConfig {
     pub module_name: String,
     pub version_range: Range,
@@ -66,85 +36,43 @@ pub struct InstrumentationConfig {
     pub channel_name: String,
 }
 
+#[derive(Debug, Clone)]
 pub struct Config {
     pub instrumentations: Vec<InstrumentationConfig>,
     pub dc_module: String,
 }
 
 impl Config {
-    pub fn from_yaml_data(yaml_str: &str) -> Result<Config, OrchestrionError> {
-        let docs = YamlLoader::load_from_str(yaml_str)?;
-        let doc = &docs[0];
-
-        let version = doc["version"]
-            .as_i64()
-            .ok_or("Invalid config: 'version' must be a number")?;
-        if version != 1 {
-            return Err("Invalid config version".into());
+    #[must_use]
+    pub fn new(instrumentations: Vec<InstrumentationConfig>, dc_module: String) -> Self {
+        Self {
+            instrumentations,
+            dc_module,
         }
-
-        let dc_module = doc["dc_module"].as_str().unwrap_or("diagnostics_channel");
-
-        let configs = InstrumentationConfig::from_yaml(doc)?;
-
-        Ok(Config {
-            instrumentations: configs,
-            dc_module: dc_module.to_string(),
-        })
     }
-}
-
-impl InstrumentationConfig {
-    pub fn from_yaml(doc: &Yaml) -> Result<Vec<InstrumentationConfig>, OrchestrionError> {
-        let instrumentations = get_arr!(doc, "instrumentations");
-        let mut configs = Vec::new();
 
-        for instr in instrumentations {
-            instr
-                .as_hash()
-                .ok_or("Invalid config: 'instrumentations' must be a array of objects")?;
-            configs.push(instr.try_into()?);
+    #[must_use]
+    pub fn new_single_with_default_dc_module(instrumentation: InstrumentationConfig) -> Self {
+        Self {
+            instrumentations: vec![instrumentation],
+            dc_module: "diagnostics_channel".to_string(),
         }
-
-        Ok(configs)
     }
+}
 
+impl InstrumentationConfig {
+    #[must_use]
     pub fn matches(&self, module_name: &str, version: &str, file_path: &PathBuf) -> bool {
         let version: Version = match version.parse() {
             Ok(v) => v,
-            Err(_) => return false,
+            Err(e) => {
+                println!("Failed to parse version {version}: {e}");
+                return false;
+            }
         };
+
         self.module_name == module_name
             && version.satisfies(&self.version_range)
             && self.file_path == *file_path
     }
 }
-
-impl TryFrom<&Yaml> for InstrumentationConfig {
-    type Error = OrchestrionError;
-
-    fn try_from(instr: &Yaml) -> Result<Self, Self::Error> {
-        let module_name = get_str!(instr, "module_name");
-        let version_range = get_str!(instr, "version_range");
-        let version_range: Range = version_range
-            .parse()
-            .map_err(|_| format!("Invalid version range: {version_range}"))?;
-        let file_path = PathBuf::from(get_str!(instr, "file_path"));
-        if instr["function_query"].as_hash().is_none() {
-            return Err("Invalid config: 'function_query' must be a object".into());
-        }
-        let function_query = (&instr["function_query"]).try_into()?;
-        let operator = InstrumentationOperator::from_str(get_str!(instr, "operator"))
-            .unwrap_or(InstrumentationOperator::Sync);
-        let channel_name = get_str!(instr, "channel_name");
-
-        Ok(InstrumentationConfig {
-            module_name: module_name.to_string(),
-            version_range,
-            file_path,
-            function_query,
-            operator,
-            channel_name: channel_name.to_string(),
-        })
-    }
-}

src/config.rs

@@ -6,9 +6,7 @@ use std::fmt::{self, Display, Formatter};
 
 #[derive(Debug)]
 pub enum OrchestrionError {
-    InvalidVersionRange(String),
     IoError(std::io::Error),
-    YamlParseError(yaml_rust2::ScanError),
     StrError(String),
 }
 
@@ -18,12 +16,6 @@ impl From<std::io::Error> for OrchestrionError {
     }
 }
 
-impl From<yaml_rust2::ScanError> for OrchestrionError {
-    fn from(e: yaml_rust2::ScanError) -> Self {
-        OrchestrionError::YamlParseError(e)
-    }
-}
-
 impl From<String> for OrchestrionError {
     fn from(s: String) -> Self {
         OrchestrionError::StrError(s)
@@ -39,9 +31,7 @@ impl From<&str> for OrchestrionError {
 impl Display for OrchestrionError {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
         match self {
-            OrchestrionError::InvalidVersionRange(s) => write!(f, "Invalid version range: {s}"),
             OrchestrionError::IoError(e) => write!(f, "IO error: {e}"),
-            OrchestrionError::YamlParseError(e) => write!(f, "YAML parse error: {e}"),
             OrchestrionError::StrError(s) => write!(f, "String error: {s}"),
         }
     }