Merge remote-tracking branch 'origin/feature/issue-427' into feature/issue-427

Author: karthiknadig

crates/pet-conda/src/environments.rs

@@ -62,7 +62,16 @@ pub struct CondaPackageInfo {
 
 impl CondaPackageInfo {
     pub fn from(path: &Path, package: &Package) -> Option<Self> {
-        get_conda_package_info(path, package)
+        let history = fs::read_to_string(path.join("conda-meta").join("history")).ok();
+        Self::from_history(path, package, history.as_deref())
+    }
+
+    pub(crate) fn from_history(
+        path: &Path,
+        package: &Package,
+        history: Option<&str>,
+    ) -> Option<Self> {
+        get_conda_package_info(path, package, history)
     }
 }
 
@@ -73,8 +82,14 @@ struct CondaMetaPackageStructure {
 }
 
 /// Get the details of a conda package from the 'conda-meta' directory.
-fn get_conda_package_info(path: &Path, name: &Package) -> Option<CondaPackageInfo> {
-    if let Some(info) = get_conda_package_info_from_history(path, name) {
+fn get_conda_package_info(
+    path: &Path,
+    name: &Package,
+    history: Option<&str>,
+) -> Option<CondaPackageInfo> {
+    if let Some(info) =
+        history.and_then(|history| get_conda_package_info_from_history(path, name, history))
+    {
         Some(info)
     } else {
         warn!(
@@ -86,14 +101,15 @@ fn get_conda_package_info(path: &Path, name: &Package) -> Option<CondaPackageInf
     }
 }
 
-fn get_conda_package_info_from_history(path: &Path, name: &Package) -> Option<CondaPackageInfo> {
+fn get_conda_package_info_from_history(
+    path: &Path,
+    name: &Package,
+    history_contents: &str,
+) -> Option<CondaPackageInfo> {
     // conda-meta is in the root of the conda installation folder
     let path = path.join("conda-meta");
-    let history = path.join("history");
     let package_entry = format!(":{}-", name.to_name());
 
-    let history_contents = fs::read_to_string(history).ok()?;
-
     // Filter to only include lines that:
     // 1. Start with '+' (installed packages, not '-' for removed packages)
     // 2. Contain the package entry (e.g., ":python-")
@@ -107,13 +123,9 @@ fn get_conda_package_info_from_history(path: &Path, name: &Package) -> Option<Co
     //   ...
     //   -defaults::python-3.9.18-h123456_0     <- removed during upgrade
     //   +defaults::python-3.9.21-h789abc_0     <- current version (we want this)
-    let matching_lines: Vec<&str> = history_contents
+    let line = history_contents
         .lines()
-        .filter(|l| l.starts_with('+') && l.contains(&package_entry))
-        .collect();
-
-    // Get the last matching line (most recent installation)
-    let line = matching_lines.last()?;
+        .rfind(|line| line.starts_with('+') && line.contains(&package_entry))?;
 
     // Sample entry in the history file
     // +conda-forge/osx-arm64::psutil-5.9.8-py312he37b823_0

crates/pet-conda/src/package.rs

@@ -5,12 +5,14 @@ use inaccurate_python_info::InaccuratePythonEnvironmentInfo;
 use missing_conda_info::MissingCondaEnvironments;
 use missing_poetry_info::MissingPoetryEnvironments;
 use refresh_performance::RefreshPerformance;
+use refresh_progress::RefreshProgress;
 use serde::{Deserialize, Serialize};
 
 pub mod inaccurate_python_info;
 pub mod missing_conda_info;
 pub mod missing_poetry_info;
 pub mod refresh_performance;
+pub mod refresh_progress;
 
 pub type NumberOfCustomSearchPaths = u32;
 
@@ -38,6 +40,8 @@ pub enum TelemetryEvent {
     MissingPoetryEnvironments(MissingPoetryEnvironments),
     /// Telemetry with metrics for finding all environments as a result of refresh.
     RefreshPerformance(RefreshPerformance),
+    /// Progress through a refresh operation, including per-locator timing.
+    RefreshProgress(RefreshProgress),
 }
 
 pub fn get_telemetry_event_name(event: &TelemetryEvent) -> &'static str {
@@ -57,5 +61,6 @@ pub fn get_telemetry_event_name(event: &TelemetryEvent) -> &'static str {
         TelemetryEvent::MissingCondaEnvironments(_) => "MissingCondaEnvironments",
         TelemetryEvent::MissingPoetryEnvironments(_) => "MissingPoetryEnvironments",
         TelemetryEvent::RefreshPerformance(_) => "RefreshPerformance",
+        TelemetryEvent::RefreshProgress(_) => "RefreshProgress",
     }
 }

crates/pet-core/src/telemetry/mod.rs

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum RefreshProgressPhase {
+    Locators,
+    Path,
+    GlobalVirtualEnvs,
+    Workspaces,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum RefreshProgressStatus {
+    Started,
+    Completed,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RefreshProgress {
+    pub refresh_id: u64,
+    pub phase: RefreshProgressPhase,
+    pub status: RefreshProgressStatus,
+    pub elapsed_ms: u128,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub phase_elapsed_ms: Option<u128>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub locator_name: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub locator_elapsed_ms: Option<u128>,
+}

crates/pet-core/src/telemetry/refresh_progress.rs

@@ -173,6 +173,43 @@ mod tests {
         assert_eq!(value["data"]["refreshPerformance"]["total"], json!(10));
     }
 
+    #[test]
+    fn refresh_progress_serializes_privacy_safe_fields() {
+        use pet_core::telemetry::refresh_progress::{
+            RefreshProgress, RefreshProgressPhase, RefreshProgressStatus,
+        };
+
+        let event = TelemetryEvent::RefreshProgress(RefreshProgress {
+            refresh_id: 42,
+            phase: RefreshProgressPhase::Locators,
+            status: RefreshProgressStatus::Completed,
+            elapsed_ms: 15,
+            phase_elapsed_ms: None,
+            locator_name: Some("Conda".to_string()),
+            locator_elapsed_ms: Some(10),
+        });
+        let payload = TelemetryData {
+            event: get_telemetry_event_name(&event).to_string(),
+            data: event,
+        };
+
+        assert_eq!(
+            serde_json::to_value(payload).unwrap(),
+            json!({
+                "event": "RefreshProgress",
+                "data": {
+                    "refreshProgress": {
+                        "refreshId": 42,
+                        "phase": "locators",
+                        "status": "completed",
+                        "elapsedMs": 15,
+                        "locatorName": "Conda",
+                        "locatorElapsedMs": 10
+                    }
+                }
+            })
+        );
+    }
     #[test]
     fn log_payload_uses_camel_case_fields_and_level_renames() {
         let payload = Log {