rebase

Signed-off-by: Nir Rozenbaum <[email protected]>

Author: nirrozenbaum

docs/proposals/0845-scheduler-architecture-proposal/interfaces/interface.go

@@ -29,7 +29,7 @@ type Endpoint struct {
 type EndpointState struct {
 	// storage is per Scheduling Cycle, and so has no thread-safe concerns.
 	// TODO should think if the above is true or should we use sync map for thread safety.
-	storage map[string]any 
+	storage map[string]any
 }
 
 // ScoredEndpoint encapsulates Endpoint with its Score.
@@ -92,30 +92,8 @@ type MultiProfilePlugin interface {
 	// - profiles - A subset of the registered scheduling profiles to be ran in next iteration
 	PickProfiles(request map[string]any, profiles map[string]*SchedulerProfile, executionResults map[string][]*ScoredEndpoint) map[string]*SchedulerProfile
 
-<<<<<<< HEAD
-type EndpointState struct {
-	// storage is per Scheduling Cycle, and so has no thread-safe concerns.
-	storage map[string]any //nolint:unused
-}
-
-type SchedulingResult struct {
-	results map[string][]Endpoint //nolint:unused
-}
-
-// Scheduler is the implementation of a... scheduler.
-// The scheduler object is created at startup using the provided configuration.
-type Scheduler interface {
-	// PreSchedule selects scheduling profiles through the implemented
-	// logic, and returns:
-	// - profiles - A subset of the registered scheduling profiles to be ran
-	PreSchedule(request map[string]any, data scheduling.CycleState, results map[string][]Endpoint) map[string]SchedulingProfile
-
-	// PostSchedule receives the output of the result(s) of the scheduling cycle(s)
-	// and makes sense of the data to be consumed by the calling system.
-=======
 	// ProcessProfileResults handles the outcome of each selected profile.
 	// It may aggregate results, log test profile outputs, or apply custom logic.
->>>>>>> 6280d8f (scheduler proposal continuation)
 	// For example: suppose you have 2 profiles ShadowBoxing Profile & Production Profile.
 	// ProcessProfileResults would know to simply log the result of ShadowBoxing
 	// profile, and do nothing else with it.