Toward executor objects

dbos/admin_server.go

@@ -25,7 +25,7 @@ type queueMetadata struct {
 	RateLimit         *RateLimiter `json:"rateLimit,omitempty"`
 }
 
-func newAdminServer(port int) *adminServer {
+func newAdminServer(ctx *dbosContext, port int) *adminServer {
 	mux := http.NewServeMux()
 
 	// Health endpoint
@@ -50,7 +50,7 @@ func newAdminServer(port int) *adminServer {
 
 		getLogger().Info("Recovering workflows for executors", "executors", executorIDs)
 
-		handles, err := recoverPendingWorkflows(r.Context(), executorIDs)
+		handles, err := recoverPendingWorkflows(ctx, executorIDs)
 		if err != nil {
 			getLogger().Error("Error recovering workflows", "error", err)
 			http.Error(w, fmt.Sprintf("Recovery failed: %v", err), http.StatusInternalServerError)

dbos/admin_server_test.go

@@ -11,27 +11,27 @@ import (
 )
 
 func TestAdminServer(t *testing.T) {
-	databaseURL := getDatabaseURL(t)
+	databaseURL := getDatabaseURL()
 
 	t.Run("Admin server is not started by default", func(t *testing.T) {
-		// Ensure clean state
-		Shutdown()
 
-		err := Initialize(Config{
+		ctx, err := NewDBOSContext(Config{
 			DatabaseURL: databaseURL,
 			AppName:     "test-app",
 		})
 		if err != nil {
 			t.Skipf("Failed to initialize DBOS: %v", err)
 		}
-		err = Launch()
+		err = ctx.Launch()
 		if err != nil {
 			t.Skipf("Failed to initialize DBOS: %v", err)
 		}
 
 		// Ensure cleanup
 		defer func() {
-			Shutdown()
+			if ctx != nil {
+				ctx.Shutdown()
+			}
 		}()
 
 		// Give time for any startup processes
@@ -45,46 +45,48 @@ func TestAdminServer(t *testing.T) {
 		}
 
 		// Verify the DBOS executor doesn't have an admin server instance
-		if dbos == nil {
+		if ctx == nil {
 			t.Fatal("Expected DBOS instance to be created")
 		}
 
-		if dbos.adminServer != nil {
+		exec := ctx.(*dbosContext)
+		if exec.adminServer != nil {
 			t.Error("Expected admin server to be nil when not configured")
 		}
 	})
 
 	t.Run("Admin server endpoints", func(t *testing.T) {
-		Shutdown()
-
 		// Launch DBOS with admin server once for all endpoint tests
-		err := Initialize(Config{
+		ctx, err := NewDBOSContext(Config{
 			DatabaseURL: databaseURL,
 			AppName:     "test-app",
 			AdminServer: true,
 		})
 		if err != nil {
 			t.Skipf("Failed to initialize DBOS with admin server: %v", err)
 		}
-		err = Launch()
+		err = ctx.Launch()
 		if err != nil {
 			t.Skipf("Failed to initialize DBOS with admin server: %v", err)
 		}
 
 		// Ensure cleanup
 		defer func() {
-			Shutdown()
+			if ctx != nil {
+				ctx.Shutdown()
+			}
 		}()
 
 		// Give the server a moment to start
 		time.Sleep(100 * time.Millisecond)
 
 		// Verify the DBOS executor has an admin server instance
-		if dbos == nil {
+		if ctx == nil {
 			t.Fatal("Expected DBOS instance to be created")
 		}
 
-		if dbos.adminServer == nil {
+		exec := ctx.(*dbosContext)
+		if exec.adminServer == nil {
 			t.Fatal("Expected admin server to be created in DBOS instance")
 		}