From 6d2b06d004f1a0476abecc272c7fb81c6cbf960c Mon Sep 17 00:00:00 2001 From: Oliver Kieselbach Date: Thu, 16 Apr 2026 01:44:46 +0200 Subject: [PATCH] refactor(agent): move enrollment domain into Enrollment/ feature subfolders Part 4 of 5 in Monitoring/ bounded-context restructure. Feature-based split: Enrollment/ (orchestrator+persistence), Flows/, Ime/ (log parsing, parser, positions, app/script state, replay, process watcher), SystemSignals/ (ESP/Hello/ShellCore/ModernDeployment/Provisioning/DesktopArrival), and Completion/ (state machine, guards, handler). Pure folder move + namespace update; no behavior change. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../Collectors/DesktopArrivalDetectorTests.cs | 7 ++++++- .../Collectors/HelloTrackerTests.cs | 7 ++++++- .../Collectors/ModernDeploymentTrackerTests.cs | 7 ++++++- .../Collectors/ProvisioningStatusTrackerTests.cs | 7 ++++++- .../Collectors/ShellCoreTrackerTests.cs | 7 ++++++- .../Core/CollectorCoordinatorTests.cs | 7 ++++++- .../Core/EnrollmentCompletionHandlerTests.cs | 7 ++++++- .../Core/EventUploadOrchestratorTests.cs | 7 ++++++- .../Core/SessionPersistenceTests.cs | 7 ++++++- .../Core/VersionCheckEventBuilderTests.cs | 7 ++++++- .../Flows/EnrollmentFlowTests.cs | 7 ++++++- .../Tracking/AppPackageStateListTests.cs | 7 ++++++- .../Tracking/AppPackageStateTests.cs | 7 ++++++- .../Tracking/CmTraceLogParserTests.cs | 7 ++++++- .../Tracking/CompletionGuardsTests.cs | 7 ++++++- .../Tracking/CompletionStateMachineTests.cs | 7 ++++++- .../Tracking/EnrollmentStatePersistenceTests.cs | 7 ++++++- .../Tracking/LogFilePositionTrackerTests.cs | 7 ++++++- .../Completion}/CompletionGuards.cs | 2 +- .../Completion}/CompletionStateMachine.cs | 2 +- .../Completion}/EnrollmentCompletionHandler.cs | 2 +- .../Completion}/EnrollmentCompletionState.cs | 2 +- .../EnrollmentStatePersistence.cs | 2 +- .../EnrollmentTracker.CompletionLogic.cs | 3 ++- .../EnrollmentTracker.Diagnostics.cs | 3 ++- .../EnrollmentTracker.EventHandlers.cs | 3 ++- .../{Tracking => Enrollment}/EnrollmentTracker.cs | 13 +++++++++---- .../{ => Enrollment}/Flows/ClassicAutopilotFlow.cs | 2 +- .../{ => Enrollment}/Flows/DevicePreparationFlow.cs | 2 +- .../{ => Enrollment}/Flows/EnrollmentFlowFactory.cs | 2 +- .../Flows/IEnrollmentFlowHandler.cs | 2 +- .../{Tracking => Enrollment/Ime}/AppPackageState.cs | 2 +- .../Ime}/AppPackageStateList.cs | 2 +- .../Ime}/CmTraceLogParser.cs | 2 +- .../Ime}/ImeLogTracker.Handlers.cs | 2 +- .../Ime}/ImeLogTracker.LogProcessing.cs | 2 +- .../{Tracking => Enrollment/Ime}/ImeLogTracker.cs | 10 +++++++--- .../Ime}/ImeProcessWatcher.cs | 2 +- .../Ime}/ImeTrackerStatePersistence.cs | 2 +- .../Ime}/LogFilePositionTracker.cs | 2 +- .../{Replay => Enrollment/Ime}/LogReplayService.cs | 9 +++++++-- .../Ime}/ScriptExecutionState.cs | 2 +- .../SystemSignals}/DesktopArrivalDetector.cs | 2 +- .../SystemSignals}/EspAndHelloTracker.cs | 2 +- .../SystemSignals}/HelloTracker.cs | 2 +- .../SystemSignals}/ModernDeploymentTracker.cs | 2 +- .../SystemSignals}/ProvisioningStatusTracker.cs | 9 +++++++-- .../SystemSignals}/ShellCoreTracker.cs | 2 +- .../Monitoring/Runtime/CollectorCoordinator.cs | 10 ++++++---- .../Monitoring/Runtime/DiagnosticsPackageService.cs | 7 ++++++- .../Monitoring/Runtime/MonitoringService.cs | 8 ++++++-- .../Monitoring/Runtime/PeriodicCollectorManager.cs | 8 ++++++-- .../Monitoring/Runtime/UserProfileResolver.cs | 5 +++++ .../Telemetry/DeviceInfo/DeviceInfoCollector.cs | 7 ++++++- .../Gather/Collectors/LogParserCollector.cs | 7 ++++++- .../Telemetry/Gather/GatherRuleContext.cs | 7 ++++++- .../Telemetry/Gather/GatherRuleExecutor.cs | 7 ++++++- .../Telemetry/Periodic/AgentSelfMetricsCollector.cs | 7 ++++++- .../Periodic/DeliveryOptimizationCollector.cs | 7 ++++++- .../AutopilotMonitor.Agent/Program.Configuration.cs | 7 ++++++- .../Program.GatherRulesMode.cs | 8 ++++++-- .../Program.ImeMatchingMode.cs | 7 ++++++- src/Agent/AutopilotMonitor.Agent/Program.cs | 7 ++++++- 63 files changed, 256 insertions(+), 75 deletions(-) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Completion}/CompletionGuards.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Completion}/CompletionStateMachine.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Enrollment/Completion}/EnrollmentCompletionHandler.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Completion}/EnrollmentCompletionState.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment}/EnrollmentStatePersistence.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment}/EnrollmentTracker.CompletionLogic.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment}/EnrollmentTracker.Diagnostics.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment}/EnrollmentTracker.EventHandlers.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment}/EnrollmentTracker.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{ => Enrollment}/Flows/ClassicAutopilotFlow.cs (82%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{ => Enrollment}/Flows/DevicePreparationFlow.cs (82%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{ => Enrollment}/Flows/EnrollmentFlowFactory.cs (91%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{ => Enrollment}/Flows/IEnrollmentFlowHandler.cs (94%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Ime}/AppPackageState.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Ime}/AppPackageStateList.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Ime}/CmTraceLogParser.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Ime}/ImeLogTracker.Handlers.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Ime}/ImeLogTracker.LogProcessing.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Ime}/ImeLogTracker.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Collectors => Enrollment/Ime}/ImeProcessWatcher.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Ime}/ImeTrackerStatePersistence.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Ime}/LogFilePositionTracker.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Replay => Enrollment/Ime}/LogReplayService.cs (92%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Tracking => Enrollment/Ime}/ScriptExecutionState.cs (94%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Collectors => Enrollment/SystemSignals}/DesktopArrivalDetector.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Collectors => Enrollment/SystemSignals}/EspAndHelloTracker.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Collectors => Enrollment/SystemSignals}/HelloTracker.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Collectors => Enrollment/SystemSignals}/ModernDeploymentTracker.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Collectors => Enrollment/SystemSignals}/ProvisioningStatusTracker.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Collectors => Enrollment/SystemSignals}/ShellCoreTracker.cs (99%) diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/DesktopArrivalDetectorTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/DesktopArrivalDetectorTests.cs index 28d56720..fbf87a47 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/DesktopArrivalDetectorTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/DesktopArrivalDetectorTests.cs @@ -1,5 +1,10 @@ -using AutopilotMonitor.Agent.Core.Monitoring.Collectors; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Collectors { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/HelloTrackerTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/HelloTrackerTests.cs index 8446527b..44cf5df5 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/HelloTrackerTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/HelloTrackerTests.cs @@ -2,10 +2,15 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using AutopilotMonitor.Agent.Core.Monitoring.Collectors; using AutopilotMonitor.Agent.Core.Tests.Helpers; using AutopilotMonitor.Shared.Models; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Collectors { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ModernDeploymentTrackerTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ModernDeploymentTrackerTests.cs index fc4fed89..0fee05bc 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ModernDeploymentTrackerTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ModernDeploymentTrackerTests.cs @@ -2,12 +2,17 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; -using AutopilotMonitor.Agent.Core.Monitoring.Collectors; using AutopilotMonitor.Agent.Core.Tests.Helpers; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Newtonsoft.Json; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Collectors { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ProvisioningStatusTrackerTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ProvisioningStatusTrackerTests.cs index 5715a6aa..28c21c03 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ProvisioningStatusTrackerTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ProvisioningStatusTrackerTests.cs @@ -3,11 +3,16 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Text.Json; -using AutopilotMonitor.Agent.Core.Monitoring.Collectors; using AutopilotMonitor.Agent.Core.Tests.Helpers; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Collectors { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ShellCoreTrackerTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ShellCoreTrackerTests.cs index 33bd132f..5e7c6352 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ShellCoreTrackerTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/ShellCoreTrackerTests.cs @@ -2,10 +2,15 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using AutopilotMonitor.Agent.Core.Monitoring.Collectors; using AutopilotMonitor.Agent.Core.Tests.Helpers; using AutopilotMonitor.Shared.Models; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Collectors { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/CollectorCoordinatorTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/CollectorCoordinatorTests.cs index 4fc58215..fcab5b6d 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/CollectorCoordinatorTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/CollectorCoordinatorTests.cs @@ -1,6 +1,11 @@ -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Core { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EnrollmentCompletionHandlerTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EnrollmentCompletionHandlerTests.cs index 73fa2306..6c5f2c32 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EnrollmentCompletionHandlerTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EnrollmentCompletionHandlerTests.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Agent.Core.Monitoring.Transport; using AutopilotMonitor.Agent.Core.Tests.Helpers; @@ -11,6 +10,12 @@ using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Moq; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Core { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EventUploadOrchestratorTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EventUploadOrchestratorTests.cs index 8b706fc9..70e279c4 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EventUploadOrchestratorTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EventUploadOrchestratorTests.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Agent.Core.Monitoring.Transport; using AutopilotMonitor.Agent.Core.Tests.Helpers; @@ -11,6 +10,12 @@ using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Moq; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Core { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/SessionPersistenceTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/SessionPersistenceTests.cs index f9de3fbd..6d2b36c6 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/SessionPersistenceTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/SessionPersistenceTests.cs @@ -1,8 +1,13 @@ using System; using System.IO; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Core { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/VersionCheckEventBuilderTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/VersionCheckEventBuilderTests.cs index f70baaa2..fc638a64 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/VersionCheckEventBuilderTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/VersionCheckEventBuilderTests.cs @@ -1,11 +1,16 @@ using System; using System.IO; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Newtonsoft.Json.Linq; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Core { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Flows/EnrollmentFlowTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Flows/EnrollmentFlowTests.cs index 5c937e42..944ddefd 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Flows/EnrollmentFlowTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Flows/EnrollmentFlowTests.cs @@ -1,6 +1,11 @@ -using AutopilotMonitor.Agent.Core.Monitoring.Flows; using AutopilotMonitor.Shared.Models; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Flows { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/AppPackageStateListTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/AppPackageStateListTests.cs index a1b882f2..e59a5549 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/AppPackageStateListTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/AppPackageStateListTests.cs @@ -1,7 +1,12 @@ using System.Collections.Generic; using System.Linq; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Tracking { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/AppPackageStateTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/AppPackageStateTests.cs index 52547f5e..8bbe2412 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/AppPackageStateTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/AppPackageStateTests.cs @@ -1,6 +1,11 @@ using System.Collections.Generic; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Tracking { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CmTraceLogParserTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CmTraceLogParserTests.cs index 5d14e9b0..a548e42f 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CmTraceLogParserTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CmTraceLogParserTests.cs @@ -1,5 +1,10 @@ -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Tracking { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CompletionGuardsTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CompletionGuardsTests.cs index 5888e1a8..baa31838 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CompletionGuardsTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CompletionGuardsTests.cs @@ -1,6 +1,11 @@ using System; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Tracking { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CompletionStateMachineTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CompletionStateMachineTests.cs index 57d497ce..ba6aa4ba 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CompletionStateMachineTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/CompletionStateMachineTests.cs @@ -1,7 +1,12 @@ using System; using System.Collections.Generic; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Tracking { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/EnrollmentStatePersistenceTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/EnrollmentStatePersistenceTests.cs index 8f0bcae9..7c34db7c 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/EnrollmentStatePersistenceTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/EnrollmentStatePersistenceTests.cs @@ -1,9 +1,14 @@ using System; using System.Collections.Generic; using System.IO; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Agent.Core.Tests.Helpers; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Tracking { diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/LogFilePositionTrackerTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/LogFilePositionTrackerTests.cs index f94ab185..8a585ff1 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/LogFilePositionTrackerTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Tracking/LogFilePositionTrackerTests.cs @@ -1,5 +1,10 @@ -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using Xunit; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Tests.Tracking { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/CompletionGuards.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/CompletionGuards.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/CompletionGuards.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/CompletionGuards.cs index 36c9172e..1d8ac881 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/CompletionGuards.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/CompletionGuards.cs @@ -1,6 +1,6 @@ using System; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion { /// /// Pure-function guards for enrollment completion decisions. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/CompletionStateMachine.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/CompletionStateMachine.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/CompletionStateMachine.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/CompletionStateMachine.cs index ad1157b1..b29e46d0 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/CompletionStateMachine.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/CompletionStateMachine.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion { /// /// Read-only snapshot of all state needed for guard evaluation and transition decisions. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/EnrollmentCompletionHandler.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/EnrollmentCompletionHandler.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/EnrollmentCompletionHandler.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/EnrollmentCompletionHandler.cs index f04281a7..b407f66f 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/EnrollmentCompletionHandler.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/EnrollmentCompletionHandler.cs @@ -14,7 +14,7 @@ using AutopilotMonitor.Shared; using AutopilotMonitor.Agent.Core.Security; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion { /// /// Handles enrollment terminal events: enrollment_complete, enrollment_failed, and diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentCompletionState.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/EnrollmentCompletionState.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentCompletionState.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/EnrollmentCompletionState.cs index 2a682cfc..661d9d4c 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentCompletionState.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Completion/EnrollmentCompletionState.cs @@ -1,4 +1,4 @@ -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion { /// /// Explicit states for the enrollment completion state machine. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentStatePersistence.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentStatePersistence.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentStatePersistence.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentStatePersistence.cs index b68f8008..2e773c58 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentStatePersistence.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentStatePersistence.cs @@ -4,7 +4,7 @@ using System.IO; using AutopilotMonitor.Agent.Core.Logging; using Newtonsoft.Json; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment { /// /// Handles persistence of EnrollmentTracker state to disk (JSON serialization). diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.CompletionLogic.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.CompletionLogic.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.CompletionLogic.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.CompletionLogic.cs index 06140cae..da6314d4 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.CompletionLogic.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.CompletionLogic.cs @@ -4,11 +4,12 @@ using System.IO; using System.Linq; using System.Threading; using AutopilotMonitor.Agent.Core.Logging; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Microsoft.Win32; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment { /// /// Partial: Enrollment completion detection, Hello/WhiteGlove/ESP failure handling, diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.Diagnostics.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.Diagnostics.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.Diagnostics.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.Diagnostics.cs index bec0567f..d3d883ad 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.Diagnostics.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.Diagnostics.cs @@ -5,10 +5,11 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Logging; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment { /// /// Partial: Device info collection at key lifecycle points, app tracking summaries, diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.EventHandlers.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.EventHandlers.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.EventHandlers.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.EventHandlers.cs index 1b4477db..062fef59 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.EventHandlers.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.EventHandlers.cs @@ -5,10 +5,11 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Logging; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment { /// /// Partial: IME log event handlers (ESP phase, app state, script completion, etc.). diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.cs index b4008a39..e7b3fd51 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/EnrollmentTracker.cs @@ -5,12 +5,17 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Flows; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Microsoft.Win32; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment { /// /// Central enrollment tracking orchestrator. @@ -25,7 +30,7 @@ namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking private readonly AgentLogger _logger; private readonly string _imeLogFolder; private readonly List _imeLogPatterns; - private readonly Collectors.EspAndHelloTracker _espAndHelloTracker; + private readonly SystemSignals.EspAndHelloTracker _espAndHelloTracker; private ImeLogTracker _imeLogTracker; private Timer _summaryTimer; @@ -367,7 +372,7 @@ namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking bool simulationMode = false, double speedFactor = 50, string imeMatchLogPath = null, - Collectors.EspAndHelloTracker espAndHelloTracker = null, + SystemSignals.EspAndHelloTracker espAndHelloTracker = null, bool isBootstrapMode = false, bool sendTraceEvents = true) { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/ClassicAutopilotFlow.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/ClassicAutopilotFlow.cs similarity index 82% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/ClassicAutopilotFlow.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/ClassicAutopilotFlow.cs index c0a4579a..09250b50 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/ClassicAutopilotFlow.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/ClassicAutopilotFlow.cs @@ -1,6 +1,6 @@ using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Flows +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows { public sealed class ClassicAutopilotFlow : IEnrollmentFlowHandler { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/DevicePreparationFlow.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/DevicePreparationFlow.cs similarity index 82% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/DevicePreparationFlow.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/DevicePreparationFlow.cs index 48f0d124..5c27d541 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/DevicePreparationFlow.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/DevicePreparationFlow.cs @@ -1,6 +1,6 @@ using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Flows +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows { public sealed class DevicePreparationFlow : IEnrollmentFlowHandler { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/EnrollmentFlowFactory.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/EnrollmentFlowFactory.cs similarity index 91% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/EnrollmentFlowFactory.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/EnrollmentFlowFactory.cs index 34adc425..81cfaa6a 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/EnrollmentFlowFactory.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/EnrollmentFlowFactory.cs @@ -1,6 +1,6 @@ using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Flows +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows { public static class EnrollmentFlowFactory { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/IEnrollmentFlowHandler.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/IEnrollmentFlowHandler.cs similarity index 94% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/IEnrollmentFlowHandler.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/IEnrollmentFlowHandler.cs index b6f3e512..b974bf5f 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Flows/IEnrollmentFlowHandler.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Flows/IEnrollmentFlowHandler.cs @@ -1,6 +1,6 @@ using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Flows +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows { /// /// Encapsulates the policy decisions that differ between the Classic Autopilot (v1) diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/AppPackageState.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/AppPackageState.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/AppPackageState.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/AppPackageState.cs index 26f15310..5f476677 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/AppPackageState.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/AppPackageState.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime { /// /// Installation state of an app package during enrollment. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/AppPackageStateList.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/AppPackageStateList.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/AppPackageStateList.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/AppPackageStateList.cs index b2b211eb..73c38957 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/AppPackageStateList.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/AppPackageStateList.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using AutopilotMonitor.Agent.Core.Logging; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime { /// /// Manages a collection of app package states during enrollment. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/CmTraceLogParser.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/CmTraceLogParser.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/CmTraceLogParser.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/CmTraceLogParser.cs index 8a61ae69..9130782e 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/CmTraceLogParser.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/CmTraceLogParser.cs @@ -2,7 +2,7 @@ using System; using System.Globalization; using System.Text.RegularExpressions; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime { /// /// Represents a single parsed line from a CMTrace-format log file diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeLogTracker.Handlers.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeLogTracker.Handlers.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeLogTracker.Handlers.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeLogTracker.Handlers.cs index 7df9c8fa..4116da6c 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeLogTracker.Handlers.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeLogTracker.Handlers.cs @@ -10,7 +10,7 @@ using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Shared.Models; using Newtonsoft.Json; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime { /// /// Partial: Event handlers for pattern matches (app state, scripts, ESP phases), diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeLogTracker.LogProcessing.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeLogTracker.LogProcessing.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeLogTracker.LogProcessing.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeLogTracker.LogProcessing.cs index 6ca52051..35da30e5 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeLogTracker.LogProcessing.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeLogTracker.LogProcessing.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime { /// /// Partial: Log file polling and pattern matching logic. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeLogTracker.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeLogTracker.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeLogTracker.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeLogTracker.cs index d7521b41..c55c7264 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeLogTracker.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeLogTracker.cs @@ -7,13 +7,17 @@ using System.Text.Json; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -using AutopilotMonitor.Agent.Core.Monitoring.Collectors; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Shared.Models; using Newtonsoft.Json; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime { /// /// Parses IME (Intune Management Extension) log files using regex patterns from the backend. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ImeProcessWatcher.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeProcessWatcher.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ImeProcessWatcher.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeProcessWatcher.cs index 5f8b1f27..70aab887 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ImeProcessWatcher.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeProcessWatcher.cs @@ -5,7 +5,7 @@ using System.Threading; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime { /// /// Watches for IntuneManagementExtension.exe process exit. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeTrackerStatePersistence.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeTrackerStatePersistence.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeTrackerStatePersistence.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeTrackerStatePersistence.cs index 104d5500..5ac70dcf 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ImeTrackerStatePersistence.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ImeTrackerStatePersistence.cs @@ -4,7 +4,7 @@ using System.IO; using AutopilotMonitor.Agent.Core.Logging; using Newtonsoft.Json; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime { /// /// Handles persistence of ImeLogTracker state to disk (JSON serialization). diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/LogFilePositionTracker.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/LogFilePositionTracker.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/LogFilePositionTracker.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/LogFilePositionTracker.cs index 848f904e..b3607fea 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/LogFilePositionTracker.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/LogFilePositionTracker.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime { /// /// Tracks file read positions for incremental log file reading. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Replay/LogReplayService.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/LogReplayService.cs similarity index 92% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Replay/LogReplayService.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/LogReplayService.cs index 2f0cd4ce..8e69a506 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Replay/LogReplayService.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/LogReplayService.cs @@ -4,10 +4,15 @@ using System.IO; using System.Threading; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Shared.Models; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; -namespace AutopilotMonitor.Agent.Core.Monitoring.Replay +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime { /// /// Replays a real Autopilot enrollment using IME log files with time compression. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ScriptExecutionState.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ScriptExecutionState.cs similarity index 94% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ScriptExecutionState.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ScriptExecutionState.cs index 8ef6275c..c979139b 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/ScriptExecutionState.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/Ime/ScriptExecutionState.cs @@ -1,4 +1,4 @@ -namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking; +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; /// /// Accumulates multi-line script execution data from IME logs before emitting diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DesktopArrivalDetector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/DesktopArrivalDetector.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DesktopArrivalDetector.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/DesktopArrivalDetector.cs index 8741646a..e67632ea 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DesktopArrivalDetector.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/DesktopArrivalDetector.cs @@ -5,7 +5,7 @@ using System.Management; using System.Threading; using AutopilotMonitor.Agent.Core.Logging; -namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals { /// /// Detects when a real user desktop becomes available (explorer.exe under a non-system user). diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/EspAndHelloTracker.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/EspAndHelloTracker.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/EspAndHelloTracker.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/EspAndHelloTracker.cs index a57d999e..0a164a86 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/EspAndHelloTracker.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/EspAndHelloTracker.cs @@ -2,7 +2,7 @@ using System; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals { /// /// Thin coordinator that composes four focused sub-trackers to deliver the ESP + Hello diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/HelloTracker.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/HelloTracker.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/HelloTracker.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/HelloTracker.cs index af2d5f8c..3f22c15f 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/HelloTracker.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/HelloTracker.cs @@ -6,7 +6,7 @@ using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Shared.Models; using Microsoft.Win32; -namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals { /// /// Tracks Windows Hello for Business (WHfB) provisioning during Autopilot enrollment. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ModernDeploymentTracker.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/ModernDeploymentTracker.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ModernDeploymentTracker.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/ModernDeploymentTracker.cs index aa5d099b..6bf74fb0 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ModernDeploymentTracker.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/ModernDeploymentTracker.cs @@ -8,7 +8,7 @@ using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Newtonsoft.Json; -namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals { /// /// Watches Microsoft-Windows-ModernDeployment-Diagnostics-Provider channels diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ProvisioningStatusTracker.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/ProvisioningStatusTracker.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ProvisioningStatusTracker.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/ProvisioningStatusTracker.cs index 44572ce9..079a75f8 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ProvisioningStatusTracker.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/ProvisioningStatusTracker.cs @@ -4,14 +4,19 @@ using System.Linq; using System.Text.Json; using System.Threading; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Interop; using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Microsoft.Win32; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; -namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals { /// /// Watches ESP provisioning category status from the registry to detect failures diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ShellCoreTracker.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/ShellCoreTracker.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ShellCoreTracker.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/ShellCoreTracker.cs index b4c4427a..a36eb7dd 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ShellCoreTracker.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Enrollment/SystemSignals/ShellCoreTracker.cs @@ -5,7 +5,7 @@ using System.Text.RegularExpressions; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors +namespace AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals { /// /// Watches Microsoft-Windows-Shell-Core/Operational for ESP-related events: diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CollectorCoordinator.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CollectorCoordinator.cs index a22551f3..1ca6be85 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CollectorCoordinator.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CollectorCoordinator.cs @@ -4,15 +4,17 @@ using System.Threading; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Collectors; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather; using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Periodic; using AutopilotMonitor.Agent.Core.Monitoring.Transport; -using AutopilotMonitor.Agent.Core.Monitoring.Replay; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/DiagnosticsPackageService.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/DiagnosticsPackageService.cs index d6c0a79c..a9086c18 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/DiagnosticsPackageService.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/DiagnosticsPackageService.cs @@ -6,11 +6,16 @@ using System.Text; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.DeviceInfo; using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather; using AutopilotMonitor.Agent.Core.Monitoring.Transport; using AutopilotMonitor.Shared; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/MonitoringService.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/MonitoringService.cs index 48eca6d1..f1a2cb7c 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/MonitoringService.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/MonitoringService.cs @@ -7,12 +7,16 @@ using System.Threading; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.DeviceInfo; using AutopilotMonitor.Agent.Core.Monitoring.Transport; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/PeriodicCollectorManager.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/PeriodicCollectorManager.cs index d748e2b5..63e1f5e4 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/PeriodicCollectorManager.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/PeriodicCollectorManager.cs @@ -3,12 +3,16 @@ using System.Collections.Generic; using System.Threading; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Collectors; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Periodic; using AutopilotMonitor.Agent.Core.Monitoring.Transport; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/UserProfileResolver.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/UserProfileResolver.cs index 0d35edf2..5f6a796a 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/UserProfileResolver.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/UserProfileResolver.cs @@ -2,6 +2,11 @@ using System; using System.Diagnostics; using System.IO; using System.Management; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.cs index ea074dfd..8dca3211 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.cs @@ -7,9 +7,14 @@ using System.Net.NetworkInformation; using System.Text.Json; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Shared.Models; using Microsoft.Win32; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.DeviceInfo { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/LogParserCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/LogParserCollector.cs index 9060c10c..9ecfc191 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/LogParserCollector.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/LogParserCollector.cs @@ -4,10 +4,15 @@ using System.IO; using System.Linq; using System.Text; using System.Text.RegularExpressions; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Shared.Models; using AutopilotMonitor.Agent.Core.Monitoring.Runtime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather.Collectors { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleContext.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleContext.cs index 530889a4..7b9c64fe 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleContext.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleContext.cs @@ -1,8 +1,13 @@ using System; using System.Collections.Generic; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Shared.Models; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleExecutor.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleExecutor.cs index 7ce8d9ec..101ff5f2 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleExecutor.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleExecutor.cs @@ -4,8 +4,13 @@ using System.Linq; using System.Threading; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather.Collectors; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Shared.Models; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/AgentSelfMetricsCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/AgentSelfMetricsCollector.cs index e0e06273..396d8c1f 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/AgentSelfMetricsCollector.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/AgentSelfMetricsCollector.cs @@ -3,9 +3,14 @@ using System.Collections.Generic; using System.Diagnostics; using System.Threading; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Transport; using AutopilotMonitor.Shared.Models; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Periodic { diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/DeliveryOptimizationCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/DeliveryOptimizationCollector.cs index 0011d369..c9b3fc86 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/DeliveryOptimizationCollector.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/DeliveryOptimizationCollector.cs @@ -7,10 +7,15 @@ using System.Management.Automation.Runspaces; using System.Text; using System.Threading; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Shared.Models; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Periodic { diff --git a/src/Agent/AutopilotMonitor.Agent/Program.Configuration.cs b/src/Agent/AutopilotMonitor.Agent/Program.Configuration.cs index d5e46e82..a71d19fd 100644 --- a/src/Agent/AutopilotMonitor.Agent/Program.Configuration.cs +++ b/src/Agent/AutopilotMonitor.Agent/Program.Configuration.cs @@ -4,10 +4,15 @@ using System.Linq; using System.Reflection; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Shared; using Microsoft.Win32; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent { diff --git a/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs b/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs index 7e2a9e00..ecde467c 100644 --- a/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs +++ b/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs @@ -4,14 +4,18 @@ using System.Linq; using System.Threading; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Configuration; -using AutopilotMonitor.Agent.Core.Monitoring.Collectors; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.DeviceInfo; using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather; using AutopilotMonitor.Agent.Core.Monitoring.Transport; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent { diff --git a/src/Agent/AutopilotMonitor.Agent/Program.ImeMatchingMode.cs b/src/Agent/AutopilotMonitor.Agent/Program.ImeMatchingMode.cs index 79cfcd55..6df520fa 100644 --- a/src/Agent/AutopilotMonitor.Agent/Program.ImeMatchingMode.cs +++ b/src/Agent/AutopilotMonitor.Agent/Program.ImeMatchingMode.cs @@ -5,9 +5,14 @@ using System.Linq; using System.Net.Http; using System.Text; using System.Text.RegularExpressions; -using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Shared.Models; using Newtonsoft.Json; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent { diff --git a/src/Agent/AutopilotMonitor.Agent/Program.cs b/src/Agent/AutopilotMonitor.Agent/Program.cs index c42af50c..f8243feb 100644 --- a/src/Agent/AutopilotMonitor.Agent/Program.cs +++ b/src/Agent/AutopilotMonitor.Agent/Program.cs @@ -5,10 +5,15 @@ using System.IO; using System.Linq; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; -using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Agent.Core.Security; using AutopilotMonitor.Shared; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Flows; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Ime; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.SystemSignals; +using AutopilotMonitor.Agent.Core.Monitoring.Enrollment.Completion; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; namespace AutopilotMonitor.Agent {