Merge branch 'feat/combine-config-enums' into feat/wasm

Author: timfish

src/config.rs

@@ -49,18 +49,18 @@ impl ModuleMatcher {
 #[cfg_attr(feature = "wasm", tsify(into_wasm_abi, from_wasm_abi))]
 #[serde(rename_all = "camelCase")]
 pub struct InstrumentationConfig {
+    pub channel_name: String,
     pub module: ModuleMatcher,
     pub function_query: FunctionQuery,
-    pub channel_name: String,
 }
 
 impl InstrumentationConfig {
     #[must_use]
-    pub fn new(module: ModuleMatcher, function_query: FunctionQuery, channel_name: &str) -> Self {
+    pub fn new(channel_name: &str, module: ModuleMatcher, function_query: FunctionQuery) -> Self {
         Self {
+            channel_name: channel_name.to_string(),
             module,
             function_query,
-            channel_name: channel_name.to_string(),
         }
     }
 }

tests/class_method_cjs/mod.rs

@@ -7,9 +7,9 @@ fn class_method_cjs() {
         file!(),
         false,
         Config::new_single(InstrumentationConfig::new(
+            "Undici_fetch",
             test_module_matcher(),
             FunctionQuery::class_method("Undici", "fetch", FunctionKind::Async),
-            "Undici_fetch",
         )),
     );
 }

tests/constructor_cjs/mod.rs

@@ -7,9 +7,9 @@ fn constructor_cjs() {
         file!(),
         false,
         Config::new_single(InstrumentationConfig::new(
+            "Undici_constructor",
             test_module_matcher(),
             FunctionQuery::class_constructor("Undici"),
-            "Undici_constructor",
         )),
     );
 }

tests/constructor_mjs/mod.rs

@@ -7,9 +7,9 @@ fn constructor_mjs() {
         file!(),
         true,
         Config::new_single(InstrumentationConfig::new(
+            "Undici_constructor",
             test_module_matcher(),
             FunctionQuery::class_constructor("Undici"),
-            "Undici_constructor",
         )),
     );
 }

tests/decl_cjs/mod.rs

@@ -7,9 +7,9 @@ fn decl_cjs() {
         file!(),
         false,
         Config::new_single(InstrumentationConfig::new(
+            "fetch_decl",
             test_module_matcher(),
             FunctionQuery::function_declaration("fetch", FunctionKind::Async),
-            "fetch_decl",
         )),
     );
 }

tests/decl_mjs/mod.rs

@@ -7,9 +7,9 @@ fn decl_mjs() {
         file!(),
         true,
         Config::new_single(InstrumentationConfig::new(
+            "fetch_decl",
             test_module_matcher(),
             FunctionQuery::function_declaration("fetch", FunctionKind::Async),
-            "fetch_decl",
         )),
     );
 }

tests/expr_cjs/mod.rs

@@ -7,9 +7,9 @@ fn expr_cjs() {
         file!(),
         false,
         Config::new_single(InstrumentationConfig::new(
+            "fetch_expr",
             test_module_matcher(),
             FunctionQuery::function_expression("fetch", FunctionKind::Async),
-            "fetch_expr",
         )),
     );
 }

tests/expr_mjs/mod.rs

@@ -7,9 +7,9 @@ fn expr_mjs() {
         file!(),
         true,
         Config::new_single(InstrumentationConfig::new(
+            "fetch_expr",
             test_module_matcher(),
             FunctionQuery::function_expression("fetch", FunctionKind::Async),
-            "fetch_expr",
         )),
     );
 }

tests/index_cjs/mod.rs

@@ -7,14 +7,14 @@ fn index_cjs() {
         file!(),
         false,
         Config::new_single(InstrumentationConfig::new(
+            "Undici_fetch",
             test_module_matcher(),
             FunctionQuery::ClassMethod {
                 class_name: "Undici".to_string(),
                 method_name: "fetch".to_string(),
                 kind: FunctionKind::Async,
                 index: 2,
             },
-            "Undici_fetch",
         )),
     );
 }

tests/multiple_class_method_cjs/mod.rs

@@ -9,14 +9,14 @@ fn multiple_class_method_cjs() {
         Config::new(
             vec![
                 InstrumentationConfig::new(
+                    "Undici_fetch1",
                     test_module_matcher(),
                     FunctionQuery::class_method("Undici", "fetch1", FunctionKind::Async),
-                    "Undici_fetch1",
                 ),
                 InstrumentationConfig::new(
+                    "Undici_fetch2",
                     test_module_matcher(),
                     FunctionQuery::class_method("Undici", "fetch2", FunctionKind::Async),
-                    "Undici_fetch2",
                 ),
             ],
             None,