Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import - new modules #6350

Merged
merged 23 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
78b370a
(pkg/flow/internal): add importsource package
wildum Feb 9, 2024
7c68059
Add ImportConfigNode
wildum Feb 9, 2024
ad2257d
Update flow controller to use the ImportConfigNode.
wildum Feb 9, 2024
ade13d8
add import test
wildum Feb 9, 2024
b943ce6
add another test to check config reload
wildum Feb 9, 2024
b7bd0f5
use runner package (goroutines leaking)
wildum Feb 12, 2024
a213e8b
stop runner to avoid goroutines leak
wildum Feb 13, 2024
a33a241
improve error handling / code quality following review
wildum Feb 13, 2024
b17dd73
prometheus metrics and health status can be collected from the import…
wildum Feb 13, 2024
153010d
extend test
wildum Feb 13, 2024
29d83af
refactor import tests
wildum Feb 14, 2024
5e6ef3c
add two more tests and increase robustness
wildum Feb 15, 2024
35abc3c
merge main
wildum Feb 16, 2024
e543e32
protect registerImport with mutex
wildum Feb 16, 2024
1221f5d
use custom args instead of local.file args for import.file
wildum Feb 16, 2024
77effec
lint
wildum Feb 16, 2024
9184077
update import nodes to be unhealthy if a nested import stops running …
wildum Feb 19, 2024
a2a655f
use %q instead of %s when logging strings
wildum Feb 19, 2024
a2f1a17
prevent runner from reusing previous tasks
wildum Feb 19, 2024
cd65c5d
refactor ExtractImportAndDeclare
wildum Feb 19, 2024
d103d18
refactor tests in multiple txtar files
wildum Feb 19, 2024
96d9d0b
equals in import config node runner should compare pointers
wildum Feb 20, 2024
f63d560
Merge branch 'main' into import-new-modules-2
wildum Feb 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkg/flow/flow.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,18 @@ func (f *Flow) Run(ctx context.Context) {
var (
components = f.loader.Components()
services = f.loader.Services()
imports = f.loader.Imports()

runnables = make([]controller.RunnableNode, 0, len(components)+len(services))
runnables = make([]controller.RunnableNode, 0, len(components)+len(services)+len(imports))
)
for _, c := range components {
runnables = append(runnables, c)
}

for _, i := range imports {
runnables = append(runnables, i)
}

// Only the root controller should run services, since modules share the
// same service instance as the root.
if !f.opts.IsModule {
Expand Down
Loading
Loading