fix foreach run

grafana · Dec 17, 2024 · 1984a4c · 1984a4c
1 parent 25a6902
commit 1984a4c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/internal/runtime/alloy.go b/internal/runtime/alloy.go
@@ -265,6 +265,7 @@ func (f *Runtime) Run(ctx context.Context) {
 				components = f.loader.Components()
 				services   = f.loader.Services()
 				imports    = f.loader.Imports()
+				forEachs   = f.loader.ForEachs()
 
 				runnables = make([]controller.RunnableNode, 0, len(components)+len(services)+len(imports))
 			)
@@ -276,6 +277,10 @@ func (f *Runtime) Run(ctx context.Context) {
 				runnables = append(runnables, i)
 			}
 
+			for _, fe := range forEachs {
+				runnables = append(runnables, fe)
+			}
+
 			// Only the root controller should run services, since modules share the
 			// same service instance as the root.
 			if !f.opts.IsModule {

diff --git a/internal/runtime/internal/controller/loader.go b/internal/runtime/internal/controller/loader.go
@@ -46,6 +46,7 @@ type Loader struct {
 	componentNodes       []ComponentNode
 	declareNodes         map[string]*DeclareNode
 	importConfigNodes    map[string]*ImportConfigNode
+	forEachNodes         map[string]*ForeachConfigNode
 	serviceNodes         []*ServiceNode
 	cache                *valueCache
 	blocks               []*ast.BlockStmt // Most recently loaded blocks, used for writing
@@ -547,6 +548,7 @@ func (l *Loader) populateConfigBlockNodes(args map[string]any, g *dag.Graph, con
 	}
 
 	l.importConfigNodes = nodeMap.importMap
+	l.forEachNodes = nodeMap.foreachMap
 
 	return diags
 }
@@ -681,6 +683,13 @@ func (l *Loader) Imports() map[string]*ImportConfigNode {
 	return l.importConfigNodes
 }
 
+// ForEachs returns the current set of for_each nodes.
+func (l *Loader) ForEachs() map[string]*ForeachConfigNode {
+	l.mut.RLock()
+	defer l.mut.RUnlock()
+	return l.forEachNodes
+}
+
 // Graph returns a copy of the DAG managed by the Loader.
 func (l *Loader) Graph() *dag.Graph {
 	l.mut.RLock()

diff --git a/internal/runtime/internal/controller/node_config_foreach.go b/internal/runtime/internal/controller/node_config_foreach.go
@@ -162,21 +162,19 @@ func (fn *ForeachConfigNode) Run(ctx context.Context) error {
 		// TODO: log error
 	}
 
-	errChan := make(chan error, 1)
-	err = fn.run(errChan, updateTasks)
-	return err
+	return fn.run(ctx, updateTasks)
 }
 
-func (fn *ForeachConfigNode) run(errChan chan error, updateTasks func() error) error {
+func (fn *ForeachConfigNode) run(ctx context.Context, updateTasks func() error) error {
 	for {
 		select {
 		case <-fn.forEachChildrenUpdateChan:
 			err := updateTasks()
 			if err != nil {
 				// TODO: log error
 			}
-		case err := <-errChan:
-			return err
+		case <-ctx.Done():
+			return nil
 		}
 	}
 }