Skip to content

Commit

Permalink
fix concurrent mishaviour
Browse files Browse the repository at this point in the history
  • Loading branch information
psycofdj committed Apr 26, 2023
1 parent d7af15f commit 73b4e46
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 8 additions & 4 deletions collectors/collectors.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ type ObjectCollector interface {
}

type Collector struct {
fetcher *fetcher.Fetcher
workers int
config *fetcher.CFConfig
filter *filters.Filter
collectors []ObjectCollector
}
Expand All @@ -22,11 +23,13 @@ func NewCollector(
namespace string,
environment string,
deployment string,
fetcher *fetcher.Fetcher,
workers int,
config *fetcher.CFConfig,
filter *filters.Filter,
) (*Collector, error) {
res := &Collector{
fetcher: fetcher,
workers: workers,
config: config,
filter: filter,
collectors: []ObjectCollector{},
}
Expand Down Expand Up @@ -100,7 +103,8 @@ func NewCollector(
}

func (c *Collector) Collect(ch chan<- prometheus.Metric) {
objs := c.fetcher.GetObjects()
fetcher := fetcher.NewFetcher(c.workers, c.config, c.filter)
objs := fetcher.GetObjects()
for _, collector := range c.collectors {
collector.Collect(objs, ch)
}
Expand Down
4 changes: 1 addition & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,7 @@ func main() {
os.Exit(1)
}

up := fetcher.NewFetcher(*workers, config, filter)

c, err := collectors.NewCollector(*metricsNamespace, *metricsEnvironment, *cfDeploymentName, up, filter)
c, err := collectors.NewCollector(*metricsNamespace, *metricsEnvironment, *cfDeploymentName, *workers, config, filter)
if err != nil {
log.Error(err)
os.Exit(1)
Expand Down

0 comments on commit 73b4e46

Please sign in to comment.