beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix double push of metrics by properly handling tickers (#2374)

Browse source
This commit is contained in:
mmetc 2023-07-25 12:19:26 +02:00 committed by GitHub
parent 7106d396dc
commit 395cace69f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/apiserver/apic_metrics.go
View file

@ -81,7 +81,7 @@ func (a *apic) SendMetrics(stop chan (bool)) {
const checkInt = 20 * time.Second const checkInt = 20 * time.Second
// intervals must always be > 0 // intervals must always be > 0
metInts := []time.Duration{1, a.metricsIntervalFirst, a.metricsInterval} metInts := []time.Duration{1*time.Millisecond, a.metricsIntervalFirst, a.metricsInterval}
log.Infof("Start send metrics to CrowdSec Central API (interval: %s once, then %s)", log.Infof("Start send metrics to CrowdSec Central API (interval: %s once, then %s)",
metInts[1].Round(time.Second), metInts[2]) metInts[1].Round(time.Second), metInts[2])
@ -94,8 +94,6 @@ func (a *apic) SendMetrics(stop chan (bool)) {
return metInts[count] return metInts[count]
} }
// store the list of machine IDs to compare
// with the next list
machineIDs := []string{} machineIDs := []string{}
reloadMachineIDs := func() { reloadMachineIDs := func() {
@ -107,6 +105,10 @@ func (a *apic) SendMetrics(stop chan (bool)) {
machineIDs = ids machineIDs = ids
} }
// store the list of machine IDs to compare
// with the next list
reloadMachineIDs()
checkTicker := time.NewTicker(checkInt) checkTicker := time.NewTicker(checkInt)
metTicker := time.NewTicker(nextMetInt()) metTicker := time.NewTicker(nextMetInt())
@ -121,9 +123,10 @@ func (a *apic) SendMetrics(stop chan (bool)) {
reloadMachineIDs() reloadMachineIDs()
if !slices.Equal(oldIDs, machineIDs) { if !slices.Equal(oldIDs, machineIDs) {
log.Infof("capi metrics: machines changed, immediate send") log.Infof("capi metrics: machines changed, immediate send")
metTicker.Reset(1) metTicker.Reset(1*time.Millisecond)
} }
case <-metTicker.C: case <-metTicker.C:
metTicker.Stop()
metrics, err := a.GetMetrics() metrics, err := a.GetMetrics()
if err != nil { if err != nil {
log.Errorf("unable to get metrics (%s), will retry", err) log.Errorf("unable to get metrics (%s), will retry", err)

8
pkg/apiserver/apic_metrics_test.go
View file

@ -26,15 +26,15 @@ func TestAPICSendMetrics(t *testing.T) {
}{ }{
{ {
name: "basic", name: "basic",
duration: time.Millisecond * 30, duration: time.Millisecond * 60,
metricsInterval: time.Millisecond * 5, metricsInterval: time.Millisecond * 10,
expectedCalls: 5, expectedCalls: 5,
setUp: func(api *apic) {}, setUp: func(api *apic) {},
}, },
{ {
name: "with some metrics", name: "with some metrics",
duration: time.Millisecond * 30, duration: time.Millisecond * 60,
metricsInterval: time.Millisecond * 5, metricsInterval: time.Millisecond * 10,
expectedCalls: 5, expectedCalls: 5,
setUp: func(api *apic) { setUp: func(api *apic) {
api.dbClient.Ent.Machine.Delete().ExecX(context.Background()) api.dbClient.Ent.Machine.Delete().ExecX(context.Background())