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.

Sign up for GitHub

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

Jump to bottom

Integrations always running regardless of enabled flag #689

Merged
merged 17 commits into from
Jul 21, 2021
Merged

Integrations always running regardless of enabled flag #689

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c9e476b
Enabled flag should drive collection
mattdurham Jun 25, 2021
afa2eee
Satisfy linter
mattdurham Jun 25, 2021
cce8999
Fix mock integration so it sets enabled = true by default
mattdurham Jun 25, 2021
6808da7
Make enabled the equivalent of not being in the config, removing it a…
mattdurham Jun 25, 2021
22f1d16
Fix issue where removing the config/disabling did NOT stop the scraper
mattdurham Jun 25, 2021
cd058b4
Remove whitespace
mattdurham Jun 25, 2021
e7b90a7
remove unneeded comment
mattdurham Jun 25, 2021
0f9ca9c
Remove duplicated delete config
mattdurham Jun 25, 2021
bb362da
Update comments and add unit tests. Also had to fix mock integration …
mattdurham Jul 21, 2021
d752a4f
Simplify unit test
mattdurham Jul 21, 2021
b7f0e68
change case because of refactor
mattdurham Jul 21, 2021
a60942a
Merge remote-tracking branch 'origin/main' into enabled_issue
mattdurham Jul 21, 2021
98895c0
filter integrations to enabled set
rfratto Jul 21, 2021
8c4c896
Move check up to the first statement
mattdurham Jul 21, 2021
f90f44a
merge
mattdurham Jul 21, 2021
7b1987f
fix merge
mattdurham Jul 21, 2021
411ccde
Fix for double loop
mattdurham Jul 21, 2021
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
10 changes: 0 additions & 10 deletions cmd/agent/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,6 @@ func main() {
if cfg != nil {
cfg.Server.Log = cfgLogger
}
// Iterate over the configurations and remove any that Enabled = false, this works by setting i to the last element
// and then returning the array minus the last element. This loses order but is performant.
for i := 0; i < len(cfg.Integrations.Integrations);{
if !cfg.Integrations.Integrations[i].CommonConfig().Enabled {
cfg.Integrations.Integrations[i] = cfg.Integrations.Integrations[len(cfg.Integrations.Integrations)-1]
cfg.Integrations.Integrations = cfg.Integrations.Integrations[:len(cfg.Integrations.Integrations)-1]
} else {
i++
}
}

return cfg, err
}
Expand Down
12 changes: 12 additions & 0 deletions pkg/integrations/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ func (m *Manager) ApplyConfig(cfg ManagerConfig) error {
// No-op
}

// Before applying any configurations, remove them from the array if enabled = false

// Iterate over our integrations. New or changed integrations will be
// started, with their existing counterparts being shut down.
for _, ic := range cfg.Integrations {
Expand All @@ -220,9 +222,14 @@ func (m *Manager) ApplyConfig(cfg ManagerConfig) error {
continue
}
p.stop()
m.im.DeleteConfig(key)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beforehand the scraper was not stopping, but the integration was.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not following how this is necessary, the second loop should be deleting the config?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the addition of the enabled check around line 227 the integration process is not started so the integration isn't added to the to m.integrations.

delete(m.integrations, key)
}

if !ic.CommonConfig().Enabled {
continue
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still think a function to return a slice of enabled integrations would be easier to follow than having to maintain this check across the two loops, IMO.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still need the integrations in the array to disable/remove them, ie going from enabled -> disabled on reload.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this is in here twice :)


l := log.With(m.logger, "integration", ic.Name())
i, err := ic.NewIntegration(l)
if err != nil {
Expand Down Expand Up @@ -258,6 +265,10 @@ func (m *Manager) ApplyConfig(cfg ManagerConfig) error {
foundConfig := false
for _, ic := range cfg.Integrations {
if integrationKey(ic.Name()) == key {
// If this is disabled then we should delete from integrations
if !ic.CommonConfig().Enabled {
break
}
foundConfig = true
break
}
Expand All @@ -268,6 +279,7 @@ func (m *Manager) ApplyConfig(cfg ManagerConfig) error {

_ = m.im.DeleteConfig(key)
process.stop()
m.im.DeleteConfig(key)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to call this twice?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not at all and removed.

delete(m.integrations, key)
}

Expand Down