IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Infra: fix data race in usagestats service (#88881)

Browse Source 
fix data race
This commit is contained in:
Diego Augusto Molina 2024-06-07 17:52:21 -03:00 committed by GitHub
parent e1530224dd
commit 7ca3ec7518
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/infra/usagestats/service/usage_stats.go
View File

@ -10,6 +10,7 @@ import (
"runtime"
"strings"
"sync"
"sync/atomic"
"time"
"github.com/google/uuid"
@ -70,7 +71,7 @@ func (uss *UsageStats) GetUsageReport(ctx context.Context) (usagestats.Report, e
func (uss *UsageStats) gatherMetrics(ctx context.Context, metrics *sync.Map) {
ctxTracer, span := uss.tracer.Start(ctx, "UsageStats.GatherLoop")
defer span.End()
totC, errC := 0, 0
var totC, errC uint64
sem := make(chan struct{}, maxConcurrentCollectors) // create a semaphore with a capacity of 5
var wg sync.WaitGroup
@ -87,9 +88,9 @@ func (uss *UsageStats) gatherMetrics(ctx context.Context, metrics *sync.Map) {
defer cancel()
fnMetrics, err := uss.runMetricsFunc(ctxWithTimeout, fn)
totC++
atomic.AddUint64(&totC, 1)
if err != nil {
errC++
atomic.AddUint64(&errC, 1)
return
}