PR comments

src/agent/coverage/src/allowlist.rs

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 use anyhow::Result;
-use regex::{Regex, RegexBuilder, RegexSet};
+use regex::{Regex, RegexSet};
 use std::path::Path;
 
 #[derive(Clone, Debug)]
@@ -142,15 +142,15 @@ fn glob_to_regex(expr: &str) -> Result<Regex> {
     let expr = expr.replace(r"\*", ".*");
 
     // Anchor to line start and end.
-    let expr = format!("^{expr}$");
-
-    let mut rb = RegexBuilder::new(&expr);
-
-    if cfg!(windows) {
-        rb.case_insensitive(true);
+    // On Windows we should also ignore case.
+    let expr = if cfg!(windows) {
+        format!("(?i)^{expr}$")
     }
+    else {
+        format!("^{expr}$")
+    };
 
-    Ok(rb.build()?)
+    Ok(Regex::new(&expr)?)
 }
 
 #[cfg(test)]

src/agent/coverage/src/allowlist/tests.rs

@@ -175,3 +175,21 @@ fn test_allowlist_escape() -> Result<()> {
 
     Ok(())
 }
+
+#[cfg(target_os = "windows")]
+#[test]
+fn test_windows_allowlists_are_not_case_sensitive() -> Result<()> {
+    let allowlist = AllowList::parse("vccrt")?;
+    assert!(allowlist.is_allowed("VCCRT"));
+
+    Ok(())
+}
+
+#[cfg(not(target_os = "windows"))]
+#[test]
+fn test_linux_allowlists_are_case_sensitive() {
+    let allowlist = AllowList::parse("vccrt")?;
+    assert!(!allowlist.is_allowed("VCCRT"));
+
+    Ok(())
+}

src/agent/coverage/src/source.rs

@@ -104,13 +104,18 @@ pub fn binary_to_source_coverage(
                         };
 
                         if let Some(file) = location.file() {
+                            let file_path = if cfg!(windows) {
+                                // Windows paths are case insensitive.
+                                FilePath::new(file.full_path().to_ascii_lowercase())?
+                            } else {
+                                FilePath::new(file.full_path())?
+                            };
+
                             // Only include relevant inlinees.
-                            if !source_allowlist.is_allowed(&file.full_path()) {
+                            if !source_allowlist.is_allowed(&file_path) {
                                 continue;
                             }
 
-                            let file_path = FilePath::new(file.full_path())?;
-
                             // We have a hit.
                             let file_coverage = source.files.entry(file_path).or_default();
                             let line = Line(line_number);

src/agent/coverage/tests/snapshot.rs

@@ -53,21 +53,21 @@ fn windows_snapshot_tests() {
             .record()
             .unwrap();
 
-        // Windows modules should be case insensitive
-        recorded
-            .coverage
-            .modules
-            .keys()
-            .for_each(|k| assert_eq!(k.to_string().to_ascii_lowercase(), k.to_string()));
-
         // generate source-line coverage info
         let source =
             coverage::source::binary_to_source_coverage(&recorded.coverage, &source_allowlist)
                 .expect("binary_to_source_coverage");
 
+        // For Windows, the source coverage is tracked using case-insensitive paths.
+        // The conversion from case-sensitive to insensitive is done when converting from binary to source coverage.
+        // By naming our test file with a capital letter, we can ensure that the case-insensitive conversion is working.
+        source.files.keys().for_each(|k| {
+            assert_eq!(k.to_string().to_ascii_lowercase(), k.to_string());
+        });
+
         let file_coverage = source
             .files
-            .get(&FilePath::new(input_path.to_string_lossy()).unwrap())
+            .get(&FilePath::new(input_path.to_string_lossy().to_ascii_lowercase()).unwrap())
             .expect("coverage for input");
 
         let mut result = String::new();

src/agent/debugger/src/module.rs

@@ -46,9 +46,7 @@ impl Module {
             error!("Error getting path from file handle: {}", e);
             "???".into()
         });
-
-        let path = PathBuf::from(path.as_os_str().to_ascii_lowercase());
-
+
         let image_details = get_image_details(&path)?;
 
         Ok(Module {