github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib/promscrape: code cleanup in runScraper func

Browse source
This commit is contained in:
Aliaksandr Valialkin 2020-04-15 11:36:16 +03:00
parent 90bd92a6f7
commit 99f0cb1f5f
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/promscrape/scraper.go
View file

@ -59,9 +59,6 @@ func runScraper(configFile string, pushData func(wr *prompbmarshal.WriteRequest)
if err != nil { if err != nil {
logger.Fatalf("cannot read %q: %s", configFile, err) logger.Fatalf("cannot read %q: %s", configFile, err)
} }
swsStatic := cfg.getStaticScrapeWork()
swsFileSD := cfg.getFileSDScrapeWork(nil)
swsK8S := cfg.getKubernetesSDScrapeWork()
mustStop := false mustStop := false
for !mustStop { for !mustStop {
@ -70,17 +67,17 @@ func runScraper(configFile string, pushData func(wr *prompbmarshal.WriteRequest)
wg.Add(1) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()
runStaticScrapers(swsStatic, pushData, stopCh) runStaticScrapers(cfg, pushData, stopCh)
}() }()
wg.Add(1) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()
runFileSDScrapers(swsFileSD, cfg, pushData, stopCh) runFileSDScrapers(cfg, pushData, stopCh)
}() }()
wg.Add(1) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()
runKubernetesSDScrapers(swsK8S, cfg, pushData, stopCh) runKubernetesSDScrapers(cfg, pushData, stopCh)
}() }()
waitForChans: waitForChans:
@ -93,9 +90,6 @@ func runScraper(configFile string, pushData func(wr *prompbmarshal.WriteRequest)
goto waitForChans goto waitForChans
} }
cfg = cfgNew cfg = cfgNew
swsStatic = cfg.getStaticScrapeWork()
swsFileSD = cfg.getFileSDScrapeWork(swsFileSD)
swsK8S = cfg.getKubernetesSDScrapeWork()
case <-globalStopCh: case <-globalStopCh:
mustStop = true mustStop = true
} }
@ -111,7 +105,8 @@ func runScraper(configFile string, pushData func(wr *prompbmarshal.WriteRequest)
var configReloads = metrics.NewCounter(`vm_promscrape_config_reloads_total`) var configReloads = metrics.NewCounter(`vm_promscrape_config_reloads_total`)
func runStaticScrapers(sws []ScrapeWork, pushData func(wr *prompbmarshal.WriteRequest), stopCh <-chan struct{}) { func runStaticScrapers(cfg *Config, pushData func(wr *prompbmarshal.WriteRequest), stopCh <-chan struct{}) {
sws := cfg.getStaticScrapeWork()
if len(sws) == 0 { if len(sws) == 0 {
return return
} }
@ -124,10 +119,11 @@ func runStaticScrapers(sws []ScrapeWork, pushData func(wr *prompbmarshal.WriteRe
var staticTargets = metrics.NewCounter(`vm_promscrape_targets{type="static"}`) var staticTargets = metrics.NewCounter(`vm_promscrape_targets{type="static"}`)
func runKubernetesSDScrapers(sws []ScrapeWork, cfg *Config, pushData func(wr *prompbmarshal.WriteRequest), stopCh <-chan struct{}) { func runKubernetesSDScrapers(cfg *Config, pushData func(wr *prompbmarshal.WriteRequest), stopCh <-chan struct{}) {
if cfg.kubernetesSDConfigsCount() == 0 { if cfg.kubernetesSDConfigsCount() == 0 {
return return
} }
sws := cfg.getKubernetesSDScrapeWork()
ticker := time.NewTicker(*kubernetesSDCheckInterval) ticker := time.NewTicker(*kubernetesSDCheckInterval)
defer ticker.Stop() defer ticker.Stop()
mustStop := false mustStop := false
@ -168,10 +164,11 @@ var (
kubernetesSDReloads = metrics.NewCounter(`vm_promscrape_reloads_total{type="kubernetes_sd"}`) kubernetesSDReloads = metrics.NewCounter(`vm_promscrape_reloads_total{type="kubernetes_sd"}`)
) )
func runFileSDScrapers(sws []ScrapeWork, cfg *Config, pushData func(wr *prompbmarshal.WriteRequest), stopCh <-chan struct{}) { func runFileSDScrapers(cfg *Config, pushData func(wr *prompbmarshal.WriteRequest), stopCh <-chan struct{}) {
if cfg.fileSDConfigsCount() == 0 { if cfg.fileSDConfigsCount() == 0 {
return return
} }
sws := cfg.getFileSDScrapeWork(nil)
ticker := time.NewTicker(*fileSDCheckInterval) ticker := time.NewTicker(*fileSDCheckInterval)
defer ticker.Stop() defer ticker.Stop()
mustStop := false mustStop := false