dont use desktop runner singleton

cmd/launcher/launcher.go

@@ -504,6 +504,7 @@ func runLauncher(ctx context.Context, cancel func(), multiSlogger, systemMultiSl
 		ls, err := localserver.New(
 			ctx,
 			k,
+			runner,
 		)
 
 		if err != nil {

ee/desktop/runner/runner.go

@@ -88,32 +88,6 @@ func InstanceDesktopProcessRecords() map[string]processRecord {
 	return instance.uidProcs
 }
 
-func InstanceDetectPresence(reason string, interval time.Duration) (bool, error) {
-	if instance == nil {
-		return false, errors.New("no instance of DesktopUsersProcessesRunner")
-	}
-
-	if instance.uidProcs == nil || len(instance.uidProcs) == 0 {
-		return false, errors.New("no desktop processes running")
-	}
-
-	var lastErr error
-	for _, proc := range instance.uidProcs {
-		client := client.New(instance.userServerAuthToken, proc.socketPath)
-		success, err := client.DetectPresence(reason, interval)
-
-		// not sure how to handle the possiblity of multiple users
-		// so just return the first success
-		if success {
-			return success, err
-		}
-
-		lastErr = err
-	}
-
-	return false, fmt.Errorf("no desktop processes detected presence, last error: %w", lastErr)
-}
-
 // DesktopUsersProcessesRunner creates a launcher desktop process each time it detects
 // a new console (GUI) user. If the current console user's desktop process dies, it
 // will create a new one.
@@ -308,6 +282,28 @@ func (r *DesktopUsersProcessesRunner) Interrupt(_ error) {
 	)
 }
 
+func (r *DesktopUsersProcessesRunner) DetectPresence(reason string, interval time.Duration) (bool, error) {
+	if r.uidProcs == nil || len(r.uidProcs) == 0 {
+		return false, errors.New("no desktop processes running")
+	}
+
+	var lastErr error
+	for _, proc := range r.uidProcs {
+		client := client.New(r.userServerAuthToken, proc.socketPath)
+		success, err := client.DetectPresence(reason, interval)
+
+		// not sure how to handle the possiblity of multiple users
+		// so just return the first success
+		if success {
+			return success, err
+		}
+
+		lastErr = err
+	}
+
+	return false, fmt.Errorf("no desktop processes detected presence, last error: %w", lastErr)
+}
+
 // killDesktopProcesses kills any existing desktop processes
 func (r *DesktopUsersProcessesRunner) killDesktopProcesses(ctx context.Context) {
 	wgDone := make(chan struct{})

ee/localserver/request-id_test.go

@@ -61,7 +61,7 @@ func Test_localServer_requestIdHandler(t *testing.T) {
 func testServer(t *testing.T, k types.Knapsack) *localServer {
 	require.NoError(t, osquery.SetupLauncherKeys(k.ConfigStore()))
 
-	server, err := New(context.TODO(), k)
+	server, err := New(context.TODO(), k, nil)
 	require.NoError(t, err)
 	return server
 }

ee/localserver/server.go

@@ -19,7 +19,6 @@ import (
 	"github.com/kolide/krypto/pkg/echelper"
 	"github.com/kolide/launcher/ee/agent"
 	"github.com/kolide/launcher/ee/agent/types"
-	"github.com/kolide/launcher/ee/desktop/runner"
 	"github.com/kolide/launcher/pkg/osquery"
 	"github.com/kolide/launcher/pkg/traces"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
@@ -57,14 +56,20 @@ type localServer struct {
 
 	serverKey   *rsa.PublicKey
 	serverEcKey *ecdsa.PublicKey
+
+	presenceDetector presenceDetector
 }
 
 const (
 	defaultRateLimit = 5
 	defaultRateBurst = 10
 )
 
-func New(ctx context.Context, k types.Knapsack) (*localServer, error) {
+type presenceDetector interface {
+	DetectPresence(reason string, interval time.Duration) (bool, error)
+}
+
+func New(ctx context.Context, k types.Knapsack, presenceDetector presenceDetector) (*localServer, error) {
 	_, span := traces.StartSpan(ctx)
 	defer span.End()
 
@@ -75,6 +80,7 @@ func New(ctx context.Context, k types.Knapsack) (*localServer, error) {
 		kolideServer:          k.KolideServerURL(),
 		myLocalDbSigner:       agent.LocalDbKeys(),
 		myLocalHardwareSigner: agent.HardwareKeys(),
+		presenceDetector:      presenceDetector,
 	}
 
 	// TODO: As there may be things that adjust the keys during runtime, we need to persist that across
@@ -427,7 +433,7 @@ func (ls *localServer) presenceDetectionHandler(next http.Handler) http.Handler
 			reason = reasonHeader
 		}
 
-		success, err := runner.InstanceDetectPresence(reason, detectionIntervalDuration)
+		success, err := ls.presenceDetector.DetectPresence(reason, detectionIntervalDuration)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusUnauthorized)
 			return

ee/localserver/server_test.go

@@ -36,7 +36,7 @@ func TestInterrupt_Multiple(t *testing.T) {
 	recalculateInterval = 100 * time.Millisecond
 
 	// Create the localserver
-	ls, err := New(context.TODO(), k)
+	ls, err := New(context.TODO(), k, nil)
 	require.NoError(t, err)
 
 	// Set the querier