feat: Include module version in event args

Author: timfish

src/instrumentation.rs

@@ -33,6 +33,7 @@ pub struct Instrumentation {
     count: usize,
     is_correct_class: bool,
     has_injected: bool,
+    module_version: Option<String>,
 }
 
 impl Instrumentation {
@@ -43,9 +44,14 @@ impl Instrumentation {
             count: 0,
             is_correct_class: false,
             has_injected: false,
+            module_version: None,
         }
     }
 
+    pub fn set_module_version(&mut self, version: &str) {
+        self.module_version = Some(version.to_string());
+    }
+
     #[must_use]
     pub fn has_injected(&self) -> bool {
         self.has_injected
@@ -134,10 +140,18 @@ impl Instrumentation {
                 "if (!$ch.hasSubscribers) return __apm$traced();" as Stmt,
                 ch = ch_ident
             ),
-            quote!(
-                "return $trace(__apm$traced, { arguments, self: this } );" as Stmt,
-                trace = trace_ident
-            ),
+            match &self.module_version {
+                Some(version) => quote!(
+                    "return $trace(__apm$traced, { arguments, self: this, module_version: $version } );"
+                        as Stmt,
+                    trace = trace_ident,
+                    version: Expr = version.as_str().into(),
+                ),
+                None => quote!(
+                    "return $trace(__apm$traced, { arguments, self: this } );" as Stmt,
+                    trace = trace_ident,
+                ),
+            },
         ];
 
         self.has_injected = true;
@@ -184,7 +198,15 @@ impl Instrumentation {
         }
 
         body.stmts = vec![
-            quote!("const $ctx = { arguments };" as Stmt, ctx = ctx_ident,),
+            match &self.module_version {
+                Some(version) => {
+                    quote!("const $ctx = { arguments, module_version: $version };" as Stmt,
+                        ctx = ctx_ident,
+                        version: Expr = version.as_str().into()
+                    )
+                }
+                None => quote!("const $ctx = { arguments };" as Stmt, ctx = ctx_ident,),
+            },
             try_catch,
         ];
 

src/lib.rs

@@ -82,6 +82,7 @@ pub struct Instrumentor {
 }
 
 impl Instrumentor {
+    #[must_use]
     pub fn new(config: Config) -> Self {
         Self {
             instrumentations: config
@@ -102,10 +103,16 @@ impl Instrumentor {
         version: &str,
         file_path: &PathBuf,
     ) -> InstrumentationVisitor {
-        let instrumentations = self
+        let mut instrumentations = self
             .instrumentations
             .iter()
-            .filter(|instr| instr.matches(module_name, version, file_path));
+            .filter(|instr| instr.matches(module_name, version, file_path))
+            .cloned()
+            .collect::<Vec<_>>();
+
+        for instr in &mut instrumentations {
+            instr.set_module_version(version);
+        }
 
         InstrumentationVisitor::new(instrumentations, &self.dc_module)
     }
@@ -118,12 +125,10 @@ pub struct InstrumentationVisitor {
 }
 
 impl InstrumentationVisitor {
-    fn new<'b, I>(instrumentations: I, dc_module: &str) -> Self
-    where
-        I: Iterator<Item = &'b Instrumentation>,
-    {
+    fn new(instrumentations: Vec<Instrumentation>, dc_module: &str) -> Self
+where {
         Self {
-            instrumentations: instrumentations.cloned().collect(),
+            instrumentations,
             dc_module: dc_module.to_string(),
         }
     }