hubble: Lock exporters while gathering metrics

This code seems to access a variable without holding a lock, when that variable can be modified at runtime by other logic. Add locking to avoid weird and wonderful race conditions. Found by code inspection. Signed-off-by: Joe Stringer <[email protected]>
DataDog · Nov 8, 2024 · 66c4826 · 66c4826
1 parent 98790b2
commit 66c4826
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/hubble/exporter/metrics.go b/pkg/hubble/exporter/metrics.go
@@ -82,6 +82,7 @@ func (d *dynamicExporterGaugeCollector) Describe(ch chan<- *prometheus.Desc) {
 func (d *dynamicExporterGaugeCollector) Collect(ch chan<- prometheus.Metric) {
 	var activeExporters, inactiveExporters float64
 
+	d.exporter.mutex.RLock()
 	for name, me := range d.exporter.managedExporters {
 		var value float64
 		if me.config.End == nil || me.config.End.After(time.Now()) {
@@ -94,6 +95,7 @@ func (d *dynamicExporterGaugeCollector) Collect(ch chan<- prometheus.Metric) {
 			individualExportersDesc, prometheus.GaugeValue, value, name,
 		)
 	}
+	d.exporter.mutex.RUnlock()
 
 	ch <- prometheus.MustNewConstMetric(
 		exportersDesc, prometheus.GaugeValue, activeExporters, "active",