chore(go.d): fix get dim value (#21363)
Ilya Mashchenko committed
Nov 27, 2025 at 20:33 UTC
3bd3b80e64c16743986de26ac585174495a089fb
1 file changed
+7
-16
src/go/plugin/go.d/agent/module/job.go
+7
-16
@@ -182,20 +182,11 @@ type collectedMetrics struct {
182
floatMetrics map[string]float64
183
}
184
185
-func (cm *collectedMetrics) getDimValue(dim *Dim) (float64, bool) {
186
- if dim.Float {
187
- v, ok := cm.floatMetrics[dim.ID]
188
- return v, ok
185
+func (cm *collectedMetrics) getValue(id string) (float64, bool) {
186
+ if v, ok := cm.floatMetrics[id]; ok {
187
+ return v, true
188
}
190
- v, ok := cm.intMetrics[dim.ID]
191
- return float64(v), ok
192
-}
193
-
194
-func (cm *collectedMetrics) getVarValue(vr *Var) (float64, bool) {
195
- if v, ok := cm.floatMetrics[vr.ID]; ok {
196
- return v, ok
197
- }
198
- v, ok := cm.intMetrics[vr.ID]
189
+ v, ok := cm.intMetrics[id]
190
return float64(v), ok
191
}
192
@@ -683,7 +674,7 @@ func (j *Job) updateChart(chart *Chart, mx collectedMetrics, sinceLastRun int) b
674
if dim.remove {
675
continue
676
}
686
- if _, hasData = mx.getDimValue(dim); hasData {
677
+ if _, hasData = mx.getValue(dim.ID); hasData {
678
break
679
}
680
}
@@ -708,7 +699,7 @@ func (j *Job) updateChart(chart *Chart, mx collectedMetrics, sinceLastRun int) b
699
i++
700
701
name := firstNotEmpty(dim.Name, dim.ID)
711
- v, ok := mx.getDimValue(dim)
702
+ v, ok := mx.getValue(dim.ID)
703
if !ok {
704
j.api.SETEMPTY(name)
705
continue
@@ -724,7 +715,7 @@ func (j *Job) updateChart(chart *Chart, mx collectedMetrics, sinceLastRun int) b
715
chart.Dims = chart.Dims[:i]
716
717
for _, vr := range chart.Vars {
727
- if v, ok := mx.getVarValue(vr); ok {
718
+ if v, ok := mx.getValue(vr.ID); ok {
719
name := firstNotEmpty(vr.Name, vr.ID)
720
j.api.VARIABLE(name, v)
721
}